提交 e98f7486 编写于 作者: S slzhou

Merge branch '2.6' of github.com:taosdata/TDengine into szhou/fixbugs26

Subproject commit 05b61e03a15512fc23beb9dcd11238e1d7630c26
Subproject commit 634399d329d8fa6be61b9cb44144c1d974cd646e
......@@ -3836,6 +3836,11 @@ _return:
int32_t filterGetIndexedColumnInfo(SFilterInfo* info, char** val, int32_t *order, int32_t *flag) {
if (FILTER_GET_FLAG(info->status, FI_STATUS_EMPTY)) {
*order = 0;
return TSDB_CODE_SUCCESS;
}
SFilterComUnit *cunit = info->cunits;
uint8_t optr = cunit->optr;
......
......@@ -198,7 +198,7 @@
37,,script,./test.sh -f unique/arbitrator/offline_replica2_alterTable_online.sim
37,,script,./test.sh -f general/table/delete_reuse1.sim
37,,script,./test.sh -f general/db/delete_reuse2.sim
36,,docs-examples-test,eval sh -c \"if [ `uname -m` != aarch64 ]; then ./test_rust.sh; fi\"
# 36,,docs-examples-test,eval sh -c \"if [ `uname -m` != aarch64 ]; then ./test_rust.sh; fi\"
36,,script,./test.sh -f unique/stable/replica3_vnode3.sim
36,,script,./test.sh -f unique/stable/dnode2_stop.sim
36,,script,./test.sh -f unique/arbitrator/sync_replica2_alterTable_add.sim
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册