Merge branch '3.0' of https://github.com/taosdata/TDengine into...

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

source/libs/parser/src/parTranslater.c

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

tests/script/tsim/alter/table.sim

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