database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-10-31 18:30:33 +03:00
Code Activity

Merge branch 'master' of https://github.com/davidhilldallas/InfiniDB_MariaDB

Browse Source
This commit is contained in:
david hill
2016-05-06 15:34:07 -05:00
parent 440b6046b1 7109ae321c
commit c394edfaaf
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dbcon/mysql/ha_calpont.cpp
View File

@@ -343,7 +343,7 @@ static void calpont_set_error(THD* thd, uint64_t errCode, LEX_STRING* args, uint
ha_calpont::ha_calpont(handlerton *hton, TABLE_SHARE *table_arg) :
handler(hton, table_arg),
int_table_flags(HA_BINLOG_STMT_CAPABLE |
int_table_flags(HA_BINLOG_STMT_CAPABLE | HA_BINLOG_ROW_CAPABLE |
HA_TABLE_SCAN_ON_INDEX |
HA_CAN_TABLE_CONDITION_PUSHDOWN)
// int_table_flags(HA_NO_BLOBS | HA_BINLOG_STMT_CAPABLE)

13
utils/funcexp/func_from_unixtime.cpp
View File

@@ -145,7 +145,18 @@ int64_t Func_from_unixtime::getIntVal(rowgroup::Row& row,
bool& isNull,
CalpontSystemCatalog::ColType& ct)
{
return getDatetimeIntVal(row, parm, isNull, ct);
DateTime dt = getDateTime(row, parm, isNull);
if (*reinterpret_cast<int64_t*>(&dt) == 0)
{
isNull = true;
return 0;
}
char buf[32]; // actual string guaranteed to be 22
snprintf( buf, 32, "%04d%02d%02d%02d%02d%02",
dt.year, dt.month, dt.day, dt.hour,
dt.minute, dt.second );
return atoll(buf);
// return getDatetimeIntVal(row, parm, isNull, ct);
}
double Func_from_unixtime::getDoubleVal(rowgroup::Row& row,