Merge remote-tracking branch 'origin/master' into develop

# Conflicts:
#	src/client/src/tscParseInsert.c

src/util/src/tglobalcfg.c

@@ -1108,9 +1108,9 @@ void tsSetAllDebugFlag() {
  * In case that the setLocale failed to be executed, the right charset needs to be set.
  */
 void tsSetLocale() {
-  char msgLocale[] = "Invalid locale:%s, please set the valid locale in config file";
-  char msgCharset[] = "Invalid charset:%s, please set the valid charset in config file";
-  char msgCharset1[] = "failed to get charset, please set the valid charset in config file";
+  char msgLocale[] = "Invalid locale:%s, please set the valid locale in config file\n";
+  char msgCharset[] = "Invalid charset:%s, please set the valid charset in config file\n";
+  char msgCharset1[] = "failed to get charset, please set the valid charset in config file\n";
 
   char *locale = setlocale(LC_CTYPE, tsLocale);
 

tests/examples/c/stream.c

@@ -162,12 +162,13 @@ void* insert_rows(void *sarg)
   }
 
   // insert data
-  int index = 0;  
+  int64_t begin = (int64_t)time(NULL);
+  int index = 0;
   while (1) {
     if (g_thread_exit_flag) break;
 	
     index++;
-    sprintf(command, "insert into %s values (%ld, %d)", winfo->tbl_name, 1546300800000+index*1000, index);
+    sprintf(command, "insert into %s values (%ld, %d)", winfo->tbl_name, (begin + index) * 1000, index);
     if (taos_query(taos, command)) {
       printf("failed to insert row [%s], reason:%s\n", command, taos_errstr(taos));
     }