xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge branch 'fix/main/TD-33219-2' into merge/mainto3.0

This commit is contained in:
Shengliang Guan 2024-12-20 23:52:58 +08:00
parent 6fb1a4c579 92b09f9fc7
commit bdbb0bb143
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/client/src/clientMain.c
View File

@ -2201,7 +2201,7 @@ int taos_stmt2_bind_param(TAOS_STMT2 *stmt, TAOS_STMT2_BINDV *bindv, int32_t col
if (code) { if (code) {
goto out; goto out;
} }
} else { } else if (pStmt->bInfo.tbType == TSDB_CHILD_TABLE && pStmt->sql.autoCreateTbl) {
code = stmtSetTbTags2(stmt, NULL); code = stmtSetTbTags2(stmt, NULL);
if (code) { if (code) {
return code; return code;

2
source/dnode/vnode/src/tsdb/tsdbFS2.c
View File

@ -803,7 +803,7 @@ int32_t tsdbDisableAndCancelAllBgTask(STsdb *pTsdb) {
if (k == 0) { if (k == 0) {
(void)vnodeACancel(task); (void)vnodeACancel(task);
} else { } else {
(void)vnodeAWait(task); vnodeAWait(task);
} }
} }
} }