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

TIMESTAMP namespace fixes

Browse Source 
Namespace issues in the TIMESTAMP code caused compiling to break. This
patch fixes that.
This commit is contained in:
Andrew Hutchings
2019-06-12 15:05:20 +01:00
parent d6cdef3d86
commit 1db56546ee
22 changed files with 69 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
utils/funcexp/func_time.cpp
View File

@ -120,11 +120,11 @@ string Func_time::getStrVal(rowgroup::Row& row,
case execplan::CalpontSystemCatalog::TIMESTAMP:
{
TimeStamp timestamp(parm[0]->data()->getTimestampIntVal(row, isNull));
dataconvert::TimeStamp timestamp(parm[0]->data()->getTimestampIntVal(row, isNull));
int64_t seconds = timestamp.second;
MySQLTime m_time;
gmtSecToMySQLTime(seconds, m_time, fTimeZone);
Time time;
dataconvert::MySQLTime m_time;
dataconvert::gmtSecToMySQLTime(seconds, m_time, fTimeZone);
dataconvert::Time time;
time.hour = m_time.hour;
time.minute = m_time.minute;
time.second = m_time.second;