database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-30 19:23:07 +03:00
Code Activity

Merge branch 'develop' into MCOL-265

Browse Source
This commit is contained in:
Andrew Hutchings
2019-06-10 13:58:03 +01:00
committed by GitHub
parent e89d1ac3cf 4f20e2cb80
commit 5e4f1b9933
383 changed files with 2979 additions and 24713 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
utils/funcexp/func_week.cpp
View File

@ -53,8 +53,8 @@ int64_t Func_week::getIntVal(rowgroup::Row& row,
int64_t val = 0;
int16_t mode = 0;
DateTime aDateTime;
Time aTime;
dataconvert::DateTime aDateTime;
dataconvert::Time aTime;
if (parm.size() > 1) // mode value
mode = parm[1]->data()->getIntVal(row, isNull);
@ -89,7 +89,7 @@ int64_t Func_week::getIntVal(rowgroup::Row& row,
// Time adds to now() and then gets value
case CalpontSystemCatalog::TIME:
aDateTime = static_cast<DateTime>(nowDatetime());
aDateTime = static_cast<dataconvert::DateTime>(nowDatetime());
aTime = parm[0]->data()->getTimeIntVal(row, isNull);
aTime.day = 0;
val = addTime(aDateTime, aTime);