xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge pull request #1107 from taosdata/feature/lihui 

[#1096]
This commit is contained in:
fangpanpan 2020-01-09 10:44:38 +08:00 committed by GitHub
parent b83ad01397 4217bacf54
commit 2afef97fe3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/util/src/ttime.c
View File

@ -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;