Merge branch 'develop' into feature/sangshuduo/TD-4068-taosdemo-stmt

src/client/src/tscParseInsert.c

@@ -577,12 +577,13 @@ int32_t tsParseValues(char **str, STableDataBlocks *pDataBlock, int maxRows, SSq
 
     index = 0;
     sToken = tStrGetToken(*str, &index, false);
-    *str += index;
     if (sToken.n == 0 || sToken.type != TK_RP) {
       tscSQLSyntaxErrMsg(pCmd->payload, ") expected", *str);
       code = TSDB_CODE_TSC_SQL_SYNTAX_ERROR;
-      return -1;
+      return code;
     }
+    
+    *str += index;
 
     (*numOfRows)++;
   }
@@ -712,6 +713,9 @@ static int32_t doParseInsertStatement(SSqlCmd* pCmd, char **str, STableDataBlock
 
   int32_t numOfRows = 0;
   code = tsParseValues(str, dataBuf, maxNumOfRows, pCmd, &numOfRows, tmpTokenBuf);
+  if (code != TSDB_CODE_SUCCESS) {
+    return code;
+  }
 
   for (uint32_t i = 0; i < dataBuf->numOfParams; ++i) {
     SParamInfo *param = dataBuf->params + i;