Merge branch '3.0' of https://github.com/taosdata/TDengine into fix/ZhiqiangWang/TD-13063-fix-win-test-error

This commit is contained in:
afwerar 2022-07-14 13:59:29 +08:00
commit 3bceff2bf0
2 changed files with 4 additions and 3 deletions

View File

@ -5954,7 +5954,8 @@ static int32_t buildAddColReq(STranslateContext* pCxt, SAlterTableStmt* pStmt, S
pReq->type = pStmt->dataType.type; pReq->type = pStmt->dataType.type;
pReq->flags = COL_SMA_ON; pReq->flags = COL_SMA_ON;
pReq->bytes = pStmt->dataType.bytes; // pReq->bytes = pStmt->dataType.bytes;
pReq->bytes = calcTypeBytes(pStmt->dataType);
return TSDB_CODE_SUCCESS; return TSDB_CODE_SUCCESS;
} }

View File

@ -660,8 +660,8 @@ endi
print ======= over print ======= over
sql drop database d1 sql drop database d1
sql show databases sql show databases
if $rows != 0 then if $rows != 2 then
return -1 return -1
endi endi
system sh/exec.sh -n dnode1 -s stop -x SIGINT system sh/exec.sh -n dnode1 -s stop -x SIGINT