Merge remote-tracking branch 'origin/3.0' into fix/dnode

4f09419c · Shengliang Guan · 0bb06920 · 1358bda7 · 4f09419c · 4f09419c
隐藏空白更改
内联并排

Showing with 1 addition and 6 deletion

cmake/cmake.options cmake/cmake.options +0 -6

tests/system-test/fulltest.sh tests/system-test/fulltest.sh +1 -0

未找到文件。
--- a/cmake/cmake.options
+++ b/cmake/cmake.options
@@ -83,12 +83,6 @@ option(
    OFF
    )

-option(
-    TDENGINE_3
-    "TDengine 3.x"
-    ON
-    )
-
 option(
    BUILD_ADDR2LINE
    "If build addr2line"

--- a/tests/system-test/fulltest.sh
+++ b/tests/system-test/fulltest.sh
@@ -180,6 +180,7 @@ python3 ./test.py -f 7-tmq/tmqAutoCreateTbl.py
 #python3 ./test.py -f 7-tmq/tmqDnodeRestart.py
 #python3 ./test.py -f 7-tmq/tmqUpdate-1ctb.py
 python3 ./test.py -f 7-tmq/tmqUpdate-multiCtb.py
+#python3 ./test.py -f 7-tmq/tmqDelete-1ctb.py

 #------------querPolicy  2-----------