Merge pull request #1107 from taosdata/feature/lihui

[#1096]

Merge pull request #1107 from taosdata/feature/lihui
[#1096]
2afef97f · fangpanpan · GitHub · b83ad013 · 4217bacf · 2afef97f
隐藏空白更改
内联并排

Showing with 2 addition and 2 deletion

src/util/src/ttime.c src/util/src/ttime.c +2 -2

未找到文件。
--- a/src/util/src/ttime.c
+++ b/src/util/src/ttime.c
@@ -292,8 +292,8 @@ int32_t parseLocaltime(char* timestr, int64_t* time, int32_t timePrec) {
  }

  /* mktime will be affected by TZ, set by using taos_options */
-  int64_t seconds = mktime(&tm);
-  //int64_t seconds = (int64_t)user_mktime(&tm);
+  //int64_t seconds = mktime(&tm);
+  int64_t seconds = (int64_t)user_mktime(&tm);
  
  int64_t fraction = 0;