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_date.cpp
View File

@ -56,8 +56,8 @@ int64_t Func_date::getIntVal(rowgroup::Row& row,
string value = "";
DateTime aDateTime;
Time aTime;
dataconvert::DateTime aDateTime;
dataconvert::Time aTime;
switch (type)
{
@ -87,7 +87,7 @@ int64_t Func_date::getIntVal(rowgroup::Row& row,
case CalpontSystemCatalog::TIME:
{
int64_t val;
aDateTime = static_cast<DateTime>(nowDatetime());
aDateTime = static_cast<dataconvert::DateTime>(nowDatetime());
aTime = parm[0]->data()->getTimeIntVal(row, isNull);
aTime.day = 0;
aDateTime.hour = 0;