database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-08 14:22:09 +03:00
Code Activity

MCOL-23 Fix from_unixtime and nullif

Browse Source
This commit is contained in:
David Hall
2016-05-19 17:49:23 -05:00
parent 565f5176b0
commit 0a2e7f8cd0
2 changed files with 28 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
utils/funcexp/func_from_unixtime.cpp
View File

@@ -145,6 +145,7 @@ int64_t Func_from_unixtime::getIntVal(rowgroup::Row& row,
bool& isNull,
CalpontSystemCatalog::ColType& ct)
{
#if 0
DateTime dt = getDateTime(row, parm, isNull);
if (*reinterpret_cast<int64_t*>(&dt) == 0)
{
@@ -156,7 +157,8 @@ int64_t Func_from_unixtime::getIntVal(rowgroup::Row& row,
dt.year, dt.month, dt.day, dt.hour,
dt.minute, dt.second );
return atoll(buf);
// return getDatetimeIntVal(row, parm, isNull, ct);
#endif
return getDatetimeIntVal(row, parm, isNull, ct);
}
double Func_from_unixtime::getDoubleVal(rowgroup::Row& row,