Merge branch 'develop' into feat/sangshuduo/TD-14141-update-taostools

docs/en/20-third-party/10-hive-mq-broker.md

@@ -3,4 +3,4 @@ sidebar_label: HiveMQ Broker
 title: HiveMQ Broker writing
 ---
 
-[HiveMQ](https://www.hivemq.com/) is an MQTT broker that provides community and enterprise editions. HiveMQ is mainly for enterprise emerging machine-to-machine M2M communication and internal transport, meeting scalability, ease of management, and security features. HiveMQ provides an open-source plug-in development kit. MQTT data can be saved to TDengine via TDengine extension for HiveMQ. Please refer to the [HiveMQ extension - TDengine documentation](https://github.com/huskar-t/hivemq-tdengine-extension/blob/b62a26ecc164a310104df57691691b237e091c89/README_EN.md) for details on how to use it.
+[HiveMQ](https://www.hivemq.com/) is an MQTT broker that provides community and enterprise editions. HiveMQ is mainly for enterprise emerging machine-to-machine M2M communication and internal transport, meeting scalability, ease of management, and security features. HiveMQ provides an open-source plug-in development kit. MQTT data can be saved to TDengine via TDengine extension for HiveMQ. Please refer to the [HiveMQ extension - TDengine documentation](https://github.com/taosdata/hivemq-tdengine-extension/blob/master/README_EN.md) for details on how to use it.
\ No newline at end of file

docs/zh/20-third-party/10-hive-mq-broker.md

@@ -3,4 +3,4 @@ sidebar_label: HiveMQ Broker
 title: HiveMQ Broker 写入
 ---
 
-[HiveMQ](https://www.hivemq.com/) 是一个提供免费个人版和企业版的 MQTT 代理，主要用于企业和新兴的机器到机器 M2M 通讯和内部传输，满足可伸缩性、易管理和安全特性。HiveMQ 提供了开源的插件开发包。可以通过 HiveMQ extension - TDengine 保存数据到 TDengine。详细使用方法请参考 [HiveMQ extension - TDengine 说明文档](https://github.com/huskar-t/hivemq-tdengine-extension/blob/b62a26ecc164a310104df57691691b237e091c89/README.md)。
+[HiveMQ](https://www.hivemq.com/) 是一个提供免费个人版和企业版的 MQTT 代理，主要用于企业和新兴的机器到机器 M2M 通讯和内部传输，满足可伸缩性、易管理和安全特性。HiveMQ 提供了开源的插件开发包。可以通过 HiveMQ extension - TDengine 保存数据到 TDengine。详细使用方法请参考 [HiveMQ extension - TDengine 说明文档](https://github.com/taosdata/hivemq-tdengine-extension/blob/master/README.md)。

taosadapter @ 80594a19

-Subproject commit 4c8d92596d3c57ebc25e9ce0e0d8582685e6bcda
+Subproject commit 80594a198b7be650dbd0072c7c052714d21c6aa5

src/tsdb/src/tsdbRead.c

@@ -1865,7 +1865,7 @@ static void mergeTwoRowFromMem(STsdbQueryHandle* pQueryHandle, int32_t capacity,
   int32_t chosen_itr;
   void *value;
 
-  // the schema version info is embeded in SDataRow
+  // the schema version info is embedded in SDataRow
   int32_t numOfColsOfRow1 = 0;
 
   if (pSchema1 == NULL) {