Merge remote-tracking branch 'origin/develop' into szhou/feature/support-math-functions

documentation/webdocs/markdowndocs/administrator-ch.md

@@ -357,7 +357,7 @@ KILL STREAM <stream-id>;
 
 TDengine启动后，会自动创建一个监测数据库SYS，并自动将服务器的CPU、内存、硬盘空间、带宽、请求数、磁盘读写速度、慢查询等信息定时写入该数据库。TDengine还将重要的系统操作（比如登录、创建、删除数据库等）日志以及各种错误报警信息记录下来存放在SYS库里。系统管理员可以从CLI直接查看这个数据库，也可以在WEB通过图形化界面查看这些监测信息。
 
-这些监测信息的采集缺省是打开的，但可以修改配置文件里的选项enableMonitor将其关闭或打开。
+这些监测信息的采集缺省是打开的，但可以修改配置文件里的选项monitor将其关闭或打开。
 
 ## 文件目录结构
 

documentation/webdocs/markdowndocs/administrator.md

@@ -36,7 +36,7 @@ This section lists only the most important configuration parameters. Please chec
 - maxUsers: maximum number of users allowed
 - maxDbs: maximum number of databases allowed
 - maxTables: maximum number of tables allowed
-- enableMonitor: turn on/off system monitoring, 0: off, 1: on
+- monitor: turn on/off system monitoring, 0: off, 1: on
 - logDir: log directory, default is /var/log/taos
 - numOfLogLines: maximum number of lines in the log file
 - debugFlag: log level, 131: only error and warnings, 135: all

documentation20/cn/11.administrator/docs.md

@@ -557,7 +557,7 @@ KILL STREAM <stream-id>;
 
 TDengine启动后，会自动创建一个监测数据库log，并自动将服务器的CPU、内存、硬盘空间、带宽、请求数、磁盘读写速度、慢查询等信息定时写入该数据库。TDengine还将重要的系统操作（比如登录、创建、删除数据库等）日志以及各种错误报警信息记录下来存放在log库里。系统管理员可以从CLI直接查看这个数据库，也可以在WEB通过图形化界面查看这些监测信息。
 
-这些监测信息的采集缺省是打开的，但可以修改配置文件里的选项enableMonitor将其关闭或打开。
+这些监测信息的采集缺省是打开的，但可以修改配置文件里的选项monitor将其关闭或打开。
 
 <a class="anchor" id="optimize"></a>
 ## 性能优化

documentation20/en/11.administrator/docs.md

@@ -404,7 +404,7 @@ Force to turn off the stream computing, in which stream-id is the connection-id:
 
 After TDengine is started, it will automatically create a monitoring database log and write the server's CPU, memory, hard disk space, bandwidth, number of requests, disk read-write speed, slow query and other information into the database regularly. TDengine also records important system operations (such as logging in, creating, deleting databases, etc.) logs and various error alarm information and stores them in the log database. The system administrator can view the database directly from CLI or view the monitoring information through GUI on WEB.
 
-The collection of these monitoring metrics is turned on by default, but you can modify option enableMonitor in the configuration file to turn it off or on.
+The collection of these monitoring metrics is turned on by default, but you can modify option monitor in the configuration file to turn it off or on.
 
 ## <a class="anchor" id="directories"></a> File Directory Structure
 

src/kit/taosdemo/src/demoCommandOpt.c

@@ -1654,7 +1654,6 @@ void *queryStableAggrFunc(void *sarg) {
             if (code != 0) {
                 errorPrint("Failed to query:%s\n", taos_errstr(pSql));
                 taos_free_result(pSql);
-                taos_close(taos);
                 fclose(fp);
                 free(command);
                 return NULL;

src/kit/taosdemo/src/demoInsert.c

@@ -781,6 +781,7 @@ int createDatabasesAndStables(char *command) {
                 tmfree(cmd);
 
                 if (0 != ret) {
+                    tmfree(g_Dbs.db[i].superTbls[j].colsOfCreateChildTable);
                     errorPrint("create super table %" PRIu64 " failed!\n\n", j);
                     continue;
                 }