database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-02 17:22:27 +03:00
Code Activity

Merge pull request #1049 from pleblanc1976/mcol-3776

Browse Source 
Mcol 3776 - shared but unsync'd timezone var
This commit is contained in:
Patrick LeBlanc
2020-02-13 18:02:03 -06:00
committed by Patrick LeBlanc
parent 0db52396f9
commit d6ef3cad3d
42 changed files with 85 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
utils/funcexp/func_timestampdiff.cpp
View File

@ -57,7 +57,7 @@ int64_t Func_timestampdiff::getIntVal(rowgroup::Row& row,
TimeStamp timestamp(parm[0]->data()->getTimestampIntVal(row, isNull));
int64_t seconds = timestamp.second;
MySQLTime m_time;
gmtSecToMySQLTime(seconds, m_time, fTimeZone);
gmtSecToMySQLTime(seconds, m_time, timeZone());
dt1.year = m_time.year;
dt1.month = m_time.month;
dt1.day = m_time.day;
@ -84,7 +84,7 @@ int64_t Func_timestampdiff::getIntVal(rowgroup::Row& row,
TimeStamp timestamp(parm[1]->data()->getTimestampIntVal(row, isNull));
int64_t seconds = timestamp.second;
MySQLTime m_time;
gmtSecToMySQLTime(seconds, m_time, fTimeZone);
gmtSecToMySQLTime(seconds, m_time, timeZone());
dt2.year = m_time.year;
dt2.month = m_time.month;
dt2.day = m_time.day;