Merge branch 'develop' into feature/2.0tsdb

tests/script/basicSuite.sim

@@ -6,10 +6,8 @@ run general/import/replica1.sim
 run general/parser/auto_create_tb_drop_tb.sim
 run general/parser/binary_escapeCharacter.sim
 run general/parser/select_from_cache_disk.sim
-run general/parser/projection_limit_offset.sim
-run general/parser/join.sim
-run general/parser/where.sim
-run general/parser/projection_limit_offset.sim
+run general/parser/null_char.sim
+run general/parser/alter.sim
 run general/stable/vnode3.sim
 run general/tag/filter.sim
 run general/table/vgroup.sim