Merge remote-tracking branch 'origin/develop' into feature/os

src/wal/CMakeLists.txt

@@ -9,7 +9,7 @@ INCLUDE_DIRECTORIES(inc)
 AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/src SRC)
 
 ADD_LIBRARY(twal ${SRC})
-TARGET_LINK_LIBRARIES(twal common osdetail tutil)
+TARGET_LINK_LIBRARIES(twal tutil common)
 
 ADD_SUBDIRECTORY(test)
 

tests/pytest/stable/query_after_reset.py

@@ -76,7 +76,7 @@ class Test:
             tdSql.query("select * from st")
         except Exception as e:
             tdLog.info("Exception catched: %s" % repr(e))
-            if ('mnode invalid table name' not in repr(e)):
+            if ('Table does not exist' not in repr(e)):
                 raise Exception(repr(e))
 
     def create_stable(self):