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

MCOL-1429 Fix DAYNAME()/MONTHNAME() NULL result

Browse Source 
For NULL result -1 cast to a uint was used as an array index. This
caused crashes with TIME data type.
This commit is contained in:
Andrew Hutchings
2018-06-04 20:47:33 +01:00
parent 6948ab85a3
commit fd6a2f46a5
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
utils/funcexp/func_dayname.cpp
View File

@ -145,7 +145,9 @@ string Func_dayname::getStrVal(rowgroup::Row& row,
bool& isNull, bool& isNull,
CalpontSystemCatalog::ColType& op_ct) CalpontSystemCatalog::ColType& op_ct)
{ {
uint32_t weekday = getIntVal(row, parm, isNull, op_ct); int32_t weekday = getIntVal(row, parm, isNull, op_ct);
if (weekday == -1)
return "";
return helpers::weekdayFullNames[weekday]; return helpers::weekdayFullNames[weekday];
} }

4
utils/funcexp/func_monthname.cpp
View File

@ -47,7 +47,9 @@ string Func_monthname::getStrVal(rowgroup::Row& row,
bool& isNull, bool& isNull,
CalpontSystemCatalog::ColType& op_ct) CalpontSystemCatalog::ColType& op_ct)
{ {
uint32_t month = getIntVal(row, parm, isNull, op_ct); int32_t month = getIntVal(row, parm, isNull, op_ct);
if (month == -1)
return "";
return helpers::monthFullNames[month]; return helpers::monthFullNames[month];
} }