diff --git a/src/client/src/tscUtil.c b/src/client/src/tscUtil.c
index 0062c4dfc12857c175b82d274b79af32ece7b9ee..1d1e06d3a9a5d0bac0e4eee20f35345d65365de6 100644
--- a/src/client/src/tscUtil.c
+++ b/src/client/src/tscUtil.c
@@ -1842,6 +1842,7 @@ SSqlObj* createSubqueryObj(SSqlObj* pSql, int16_t tableIndex, void (*fp)(), void
 
   pNew->fp = fp;
   pNew->param = param;
+  pNew->maxRetry = TSDB_MAX_REPLICA_NUM;
 
   char* name = pTableMetaInfo->name;
   STableMetaInfo* pFinalInfo = NULL;
@@ -2068,47 +2069,14 @@ void tscTryQueryNextVnode(SSqlObj* pSql, __async_cb_func_t fp) {
 
     tscResetForNextRetrieve(pRes);
 
-    // in case of async query, set the callback function
-//    void* fp1 = pSql->fp;
+    // set the callback function
     pSql->fp = fp;
-
-//    if (fp1 != NULL) {
-//      assert(fp != NULL);
-//    }
-
     int32_t ret = tscProcessSql(pSql);
     if (ret == TSDB_CODE_SUCCESS) {
       return;
     } else {// todo check for failure
     }
-    // in case of async query, return now
-//    if (fp != NULL) {
-//      return;
-//    }
-//
-//    if (ret != TSDB_CODE_SUCCESS) {
-//      pSql->res.code = ret;
-//      return;
-//    }
-//
-//    // retrieve data
-//    assert(pCmd->command == TSDB_SQL_SELECT);
-//    pCmd->command = TSDB_SQL_FETCH;
-//
-//    if ((ret = tscProcessSql(pSql)) != TSDB_CODE_SUCCESS) {
-//      pSql->res.code = ret;
-//      return;
-//    }
-//
-//    // if the result from current virtual node are empty, try next if exists. otherwise, return the results.
-//    if (pRes->numOfRows > 0) {
-//      break;
-//    }
   }
-
-//  if (pRes->numOfRows == 0) {
-//    tscTrace("%p all vnodes exhausted, prj query completed. total res:%d", pSql, totalVnode, pRes->numOfTotal);
-//  }
 }
 
 void tscTryQueryNextClause(SSqlObj* pSql, void (*queryFp)()) {
diff --git a/tests/pytest/insert/multi.py b/tests/pytest/insert/multi.py
index 7725ccd210b2da63a7692b2bf17077c984dca1ab..c14d7dc2e0ac5d1317990cd2519671fdfb426b50 100644
--- a/tests/pytest/insert/multi.py
+++ b/tests/pytest/insert/multi.py
@@ -37,9 +37,15 @@ class TDTestCase:
             "CREATE TABLE if not exists dev_001 using st tags('dev_01')")
 
         print("==============step2")
-        tdLog.info("multiple inserts")
+        tdLog.info("multiple inserts by insert")
         tdSql.execute(
-            "INSERT INTO dev_001 VALUES ('2020-05-13 10:00:00.000', 1),('2020-05-13 10:00:00.001', 1)")
+            "insert INTO dev_001 VALUES ('2020-05-13 10:00:00.000', 1),('2020-05-13 10:00:00.001', 1)")
+        tdSql.checkAffectedRows(2)
+
+        print("==============step3")
+        tdLog.info("multiple inserts by import")
+        tdSql.execute(
+            "import INTO dev_001 VALUES ('2020-05-13 10:00:00.000', 1),('2020-05-13 10:00:00.001', 1)")
         tdSql.checkAffectedRows(2)
 
     def stop(self):
diff --git a/tests/pytest/table/create.py b/tests/pytest/table/create.py
new file mode 100644
index 0000000000000000000000000000000000000000..b456b444f4b361784b2bb157e453bf5ae1e57c85
--- /dev/null
+++ b/tests/pytest/table/create.py
@@ -0,0 +1,48 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import tdLog
+from util.cases import tdCases
+from util.sql import tdSql
+
+
+class TDTestCase:
+    def init(self, conn):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor())
+
+    def run(self):
+        tdSql.prepare()
+
+        print("==============step1")
+        print("prepare data")
+        tdSql.execute("create table db.st (ts timestamp, i int) tags(j int)")
+        tdSql.execute("create table db.tb using st tags(1)")
+        tdSql.execute("insert into db.tb values(now, 1)")
+
+        print("==============step2")
+        print("create table as select")
+        try:
+            tdSql.execute("create table db.test as select * from db.st")
+        except Exception as e:
+            tdLog.exit(e)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/table/del_stable.py b/tests/pytest/table/del_stable.py
index de30e6bdfe841376d9e6f61037a7fdebe4309fcd..3932f325362457dbd98838863eafddd94716f2f3 100644
--- a/tests/pytest/table/del_stable.py
+++ b/tests/pytest/table/del_stable.py
@@ -26,9 +26,7 @@ class TDTestCase:
     def run(self):
         tdSql.prepare()
 
-        tdSql.execute("drop database if exists db")
         print("==============step1")
-        tdSql.execute("create database db")
         tdSql.execute("create table db.st (ts timestamp, i int) tags(j int)")
         tdSql.execute("create table db.tb using st tags(1)")
         tdSql.execute("insert into db.tb values(now, 1)")