From d4681159b1bc5e389c1ab3a8e2d8407654ee6529 Mon Sep 17 00:00:00 2001
From: liuyq-617 <yqliu@taosdata.com>
Date: Sun, 7 Feb 2021 18:37:27 +0800
Subject: [PATCH] [td-225] fix the bug found by crash_gen

---
 src/client/src/tscServer.c   | 4 ++--
 src/client/src/tscSql.c      | 2 +-
 src/client/src/tscSubquery.c | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/client/src/tscServer.c b/src/client/src/tscServer.c
index 85eff4b9ce..6328c67940 100644
--- a/src/client/src/tscServer.c
+++ b/src/client/src/tscServer.c
@@ -451,7 +451,7 @@ int doProcessSql(SSqlObj *pSql) {
   
   if (pRes->code != TSDB_CODE_SUCCESS) {
     tscAsyncResultOnError(pSql);
-    return pRes->code;
+    return TSDB_CODE_SUCCESS;
   }
 
   int32_t code = tscSendMsgToServer(pSql);
@@ -460,7 +460,7 @@ int doProcessSql(SSqlObj *pSql) {
   if (code != TSDB_CODE_SUCCESS) {
     pRes->code = code;
     tscAsyncResultOnError(pSql);
-    return code;
+    return  TSDB_CODE_SUCCESS;
   }
   
   return TSDB_CODE_SUCCESS;
diff --git a/src/client/src/tscSql.c b/src/client/src/tscSql.c
index 8a240accec..bc2c42cf79 100644
--- a/src/client/src/tscSql.c
+++ b/src/client/src/tscSql.c
@@ -696,7 +696,7 @@ static void tscKillSTableQuery(SSqlObj *pSql) {
     }
 
     tscAsyncResultOnError(pSubObj);
-    taosReleaseRef(tscObjRef, pSubObj->self);
+    // taosRelekaseRef(tscObjRef, pSubObj->self);
   }
 
   if (pSql->subState.numOfSub <= 0) {
diff --git a/src/client/src/tscSubquery.c b/src/client/src/tscSubquery.c
index 0517afe0b3..41cfb81442 100644
--- a/src/client/src/tscSubquery.c
+++ b/src/client/src/tscSubquery.c
@@ -2362,7 +2362,7 @@ static int32_t tscReissueSubquery(SRetrieveSupport *oriTrs, SSqlObj *pSql, int32
     taos_free_result(pSql);
     return ret;
   } else {    
-    pSql->pSubs[trsupport->subqueryIndex] = pSql;
+    pParentSql->pSubs[trsupport->subqueryIndex] = pSql;
     tscFreeRetrieveSup(pNew);
     taos_free_result(pNew);
     return ret;
-- 
GitLab