Merge remote-tracking branch 'origin/hotfix/TS-544' into fix/TD-10823

src/kit/taosdemo/taosdemo.c

@@ -3505,7 +3505,7 @@ static int postProceSql(char *host, uint16_t port,
 
     do {
 #ifdef WINDOWS
-        bytes = recv(pThreadInfo->sockfds, response_buf + received, resp_len - received, 0);
+        bytes = recv(pThreadInfo->sockfd, response_buf + received, resp_len - received, 0);
 #else
         bytes = read(pThreadInfo->sockfd, response_buf + received, resp_len - received);
 #endif

src/tsdb/src/tsdbMeta.c

@@ -346,7 +346,7 @@ int tsdbUpdateTableTagValue(STsdbRepo *repo, SUpdateTableTagValMsg *pMsg) {
     tsdbError(
         "vgId:%d failed to update tag value of table %s since version out of date, client tag version %d server tag "
         "version %d",
-        REPO_ID(pRepo), TABLE_CHAR_NAME(pTable), pMsg->tversion, schemaVersion(pTable->tagSchema));
+        REPO_ID(pRepo), TABLE_CHAR_NAME(pTable), pMsg->tversion, schemaVersion(pTable->pSuper->tagSchema));
     terrno = TSDB_CODE_TDB_TAG_VER_OUT_OF_DATE;
     return -1;
   }

tests/pytest/tools/taosdemoTestTblAlt.py

@@ -56,7 +56,7 @@ class TDTestCase:
         if(threadID == 0):
             print("%staosdemo -y -t %d -n %d -b INT,INT,INT,INT" %
                       (binPath, self.numberOfTables, self.numberOfRecords))
-            os.system("%staosdemo -y -t %d -n %d -b INT,INT,INT,INT -m t" %
+            os.system("%staosdemo -y -t %d -n %d -b INT,INT,INT,INT" %
                       (binPath, self.numberOfTables, self.numberOfRecords))
         if(threadID == 1):
             time.sleep(2)