Merge branch '2.6' into fix/TS-2670-2.6

taos-tools @ 61cbfd2c

-Subproject commit 634399d329d8fa6be61b9cb44144c1d974cd646e
+Subproject commit 61cbfd2cf72d973bb35e91fa8c9df679da026499

tests/system-test/5-taos-tools/taosbenchmark/taosdemoTestInsertWithJsonSml-otherPara.py

@@ -74,8 +74,6 @@ class TDTestCase:
         tdSql.checkData(0, 0, 1)
         tdSql.query("select count(*) from stb0")
         tdSql.checkData(0, 0, 10) 
-        tdSql.query("select count(*) from stb1")
-        tdSql.checkData(0, 0, 10) 
 
         # insert:  doesn‘t currently supported sample json
         assert os.system("%staosBenchmark -f 5-taos-tools/taosbenchmark/sml/insert-sample-sml.json -y " % binPath) != 0