Merge branch '3.0' into feature/3.0_glzhao

6a730112 · Ganlin Zhao · d8f8e075 · a7d7f180 · 6a730112 · 6a730112
展开全部显示空白变更内容
内联并排

Showing with 241 addition and 232 deletion

example/src/tstream.c example/src/tstream.c +1 -1

source/libs/function/src/builtinsimpl.c source/libs/function/src/builtinsimpl.c +240 -231

未找到文件。
--- a/example/src/tstream.c
+++ b/example/src/tstream.c
@@ -25,7 +25,7 @@ int32_t init_env() {
    return -1;
  }
-  TAOS_RES* pRes = taos_query(pConn, "create database if not exists abc1 vgroups 2");
+  TAOS_RES* pRes = taos_query(pConn, "create database if not exists abc1 vgroups 1");
  if (taos_errno(pRes) != 0) {
    printf("error in create db, reason:%s\n", taos_errstr(pRes));
    return -1;

--- a/source/libs/function/src/builtinsimpl.c
+++ b/source/libs/function/src/builtinsimpl.c