diff --git a/src/client/src/tscLocal.c b/src/client/src/tscLocal.c
index 030b033653613faf1cc3071bedfaf79613f17ae6..590c2829d0b70522467cb48127e0fdde6f1448d6 100644
--- a/src/client/src/tscLocal.c
+++ b/src/client/src/tscLocal.c
@@ -430,7 +430,7 @@ static int32_t tscGetTableTagValue(SCreateBuilder *builder, char *result) {
   SSqlObj* pSql = builder->pInterSql;
 
   if (row == NULL) {
-   return TSDB_CODE_MND_INVALID_TABLE_NAME;
+   return TSDB_CODE_TSC_INVALID_TABLE_NAME;
   }
 
   int32_t* lengths = taos_fetch_lengths(pSql);  
@@ -458,7 +458,7 @@ static int32_t tscGetTableTagValue(SCreateBuilder *builder, char *result) {
   }  
 
   if (0 == strlen(result)) {
-   return TSDB_CODE_MND_INVALID_TABLE_NAME; 
+   return TSDB_CODE_TSC_INVALID_TABLE_NAME;
   }
   return TSDB_CODE_SUCCESS;
 }
@@ -554,7 +554,7 @@ int32_t tscRebuildCreateTableStatement(void *param,char *result) {
 static int32_t tscGetDBInfo(SCreateBuilder *builder, char *result) {
   TAOS_ROW row = tscFetchRow(builder);
   if (row == NULL) {
-   return TSDB_CODE_MND_DB_NOT_SELECTED; 
+   return TSDB_CODE_TSC_DB_NOT_SELECTED;
   }
   const char *showColumns[] = {"REPLICA", "QUORUM", "DAYS", "KEEP", "BLOCKS", NULL};
 
@@ -586,7 +586,7 @@ static int32_t tscGetDBInfo(SCreateBuilder *builder, char *result) {
   } while (row != NULL);
 
   if (0 == strlen(result)) {
-   return TSDB_CODE_MND_DB_NOT_SELECTED; 
+   return TSDB_CODE_TSC_DB_NOT_SELECTED;
   }
 
   return TSDB_CODE_SUCCESS;
diff --git a/src/client/src/tscSQLParser.c b/src/client/src/tscSQLParser.c
index 30a25a0285fb2c180a606cf0bc61fb44b8b5d626..66e239074d5618072d41c4cf45a14c0666aa57b3 100644
--- a/src/client/src/tscSQLParser.c
+++ b/src/client/src/tscSQLParser.c
@@ -821,7 +821,7 @@ int32_t tscSetTableFullName(STableMetaInfo* pTableMetaInfo, SStrToken* pzTableNa
     SStrToken t = {0};
     getCurrentDBName(pSql, &t);
     if (t.n == 0) {  // current database not available or not specified
-      code = TSDB_CODE_MND_DB_NOT_SELECTED;
+      code = TSDB_CODE_TSC_DB_NOT_SELECTED;
     } else {
       code = setObjFullName(pTableMetaInfo->name, NULL, &t, pzTableName, NULL);
       if (code != 0) {
diff --git a/src/inc/taoserror.h b/src/inc/taoserror.h
index 6987647fe4d78b52610ec9bc2c47366a45bb4c84..781b5897a19e77ab10a6959614658cba9ea4f798 100644
--- a/src/inc/taoserror.h
+++ b/src/inc/taoserror.h
@@ -99,6 +99,8 @@ TAOS_DEFINE_ERROR(TSDB_CODE_TSC_DISCONNECTED,             0, 0x0213, "Disconnect
 TAOS_DEFINE_ERROR(TSDB_CODE_TSC_NO_WRITE_AUTH,            0, 0x0214, "No write permission")
 TAOS_DEFINE_ERROR(TSDB_CODE_TSC_CONN_KILLED,              0, 0x0215, "Connection killed")
 TAOS_DEFINE_ERROR(TSDB_CODE_TSC_SQL_SYNTAX_ERROR,         0, 0x0216, "Syntax error in SQL")
+TAOS_DEFINE_ERROR(TSDB_CODE_TSC_DB_NOT_SELECTED,          0, 0x0217, "Database not specified or available")
+TAOS_DEFINE_ERROR(TSDB_CODE_TSC_INVALID_TABLE_NAME,       0, 0x0218, "Table does not exist")
 
 // mnode
 TAOS_DEFINE_ERROR(TSDB_CODE_MND_MSG_NOT_PROCESSED,        0, 0x0300, "Message not processed")