database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-29 08:21:15 +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_ceil.cpp
View File

@ -164,7 +164,7 @@ int64_t Func_ceil::getIntVal(Row& row,
TimeStamp dt(parm[0]->data()->getTimestampIntVal(row, isNull));
if (!isNull)
ret = dt.convertToMySQLint(fTimeZone);
ret = dt.convertToMySQLint(timeZone());
}
break;
@ -269,7 +269,7 @@ uint64_t Func_ceil::getUintVal(Row& row,
TimeStamp dt(parm[0]->data()->getTimestampIntVal(row, isNull));
if (!isNull)
ret = dt.convertToMySQLint(fTimeZone);
ret = dt.convertToMySQLint(timeZone());
}
break;