database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-11-25 20:23:16 +03:00
Code Activity

MCOL-3776: PrimProc crash

Browse Source 
Added sync to timezone var accesses.
This commit is contained in:
Patrick LeBlanc
2020-02-13 16:54:32 -05:00
parent cf668897ef
commit abad95bc04
42 changed files with 85 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
utils/funcexp/func_timediff.cpp
View File

@@ -152,7 +152,7 @@ string Func_timediff::getStrVal(rowgroup::Row& row,
dataconvert::TimeStamp timestamp(temp);
int64_t seconds = timestamp.second;
dataconvert::MySQLTime time;
dataconvert::gmtSecToMySQLTime(seconds, time, fTimeZone);
dataconvert::gmtSecToMySQLTime(seconds, time, timeZone());
dataconvert::DateTime dt;
dt.year = time.year;
dt.month = time.month;
@@ -239,7 +239,7 @@ string Func_timediff::getStrVal(rowgroup::Row& row,
dataconvert::TimeStamp timestamp(temp);
int64_t seconds = timestamp.second;
dataconvert::MySQLTime time;
dataconvert::gmtSecToMySQLTime(seconds, time, fTimeZone);
dataconvert::gmtSecToMySQLTime(seconds, time, timeZone());
dataconvert::DateTime dt;
dt.year = time.year;
dt.month = time.month;
@@ -332,7 +332,7 @@ int64_t Func_timediff::getTimestampIntVal(rowgroup::Row& row,
bool& isNull,
CalpontSystemCatalog::ColType& ct)
{
return dataconvert::DataConvert::timestampToInt(getStrVal(row, parm, isNull, ct), fTimeZone);
return dataconvert::DataConvert::timestampToInt(getStrVal(row, parm, isNull, ct), timeZone());
}
int64_t Func_timediff::getTimeIntVal(rowgroup::Row& row,