[td-225]merge master

2021-04-28 15:03:28 +08:00 · 2021-04-28 15:03:28 +08:00 · b4a072f0e3
parent 15b8a77142 2a425e92b6
commit b4a072f0e3
2 changed files with 206 additions and 188 deletions
--- a/src/common/src/tglobal.c
+++ b/src/common/src/tglobal.c
@ -921,7 +921,7 @@ static void doInitGlobalConfig(void) {
  cfg.valType = TAOS_CFG_VTYPE_INT32;
  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_CLIENT | TSDB_CFG_CTYPE_B_SHOW;
  cfg.minValue = -1;
-  cfg.maxValue = 10000000;
+  cfg.maxValue = 10000000000.0f;
  cfg.ptrLength = 0;
  cfg.unitType = TAOS_CFG_UTYPE_NONE;
  taosInitConfigOption(cfg);
--- a/src/kit/taosdemo/taosdemo.c
+++ b/src/kit/taosdemo/taosdemo.c