Merge pull request #2379 from taosdata/feature/query

[td-225]

src/client/src/tscParseInsert.c

@@ -1321,7 +1321,6 @@ int tsParseSql(SSqlObj *pSql, bool initialParse) {
   int32_t ret = TSDB_CODE_SUCCESS;
   SSqlCmd* pCmd = &pSql->cmd;
 
-  tscTrace("------------------%p, initial:%d, sqlstr:%s", pSql, initialParse, pSql->sqlstr);
   if (!pCmd->parseFinished) {
     tscTrace("%p resume to parse sql: %s", pSql, pCmd->curSql);
   }

src/client/src/tscSubquery.c

@@ -1853,18 +1853,17 @@ static void multiVnodeInsertFinalize(void* param, TAOS_RES* tres, int numOfRows)
   SSubqueryState* pState = pSupporter->pState;
 
   // record the total inserted rows
-  if (numOfRows > 0) {
-    if (tres != pParentObj) {
+  if (numOfRows > 0 && tres != pParentObj) {
       pParentObj->res.numOfRows += numOfRows;
-    }
-  } else {
+  }
+
+  if (taos_errno(tres) != 0) {
     SSqlObj* pSql = (SSqlObj*) tres;
     assert(pSql != NULL && pSql->res.code == numOfRows);
     
     pParentObj->res.code = pSql->res.code;
   }
 
-
   // it is not the initial sqlObj, free it
   if (tres != pParentObj) {
     taos_free_result(tres);