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

MCOL-1775 Fix addtime/subtime for WHERE

Browse Source 
MariaDB server renamed addtime/subtime so we need to use the new names
for these functions.
This commit is contained in:
Andrew Hutchings
2018-10-06 11:27:51 +01:00
parent 3fffc75d86
commit 6a72b28bab
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
dbcon/mysql/ha_calpont_execplan.cpp
View File

@@ -3665,11 +3665,17 @@ ReturnedColumn* buildFunctionColumn(
gwi.no_parm_func_list.push_back(fc); gwi.no_parm_func_list.push_back(fc);
} }
// add the sign for addtime function // func name is addtime/subtime in 10.3.9
if (funcName == "add_time") // note: this means get_time() can now go away in our server fork
if ((funcName == "addtime") || (funcName == "subtime"))
{ {
int64_t sign = 1;
if (funcName == "subtime")
{
sign = -1;
}
Item_func_add_time* addtime = (Item_func_add_time*)ifp; Item_func_add_time* addtime = (Item_func_add_time*)ifp;
sptp.reset(new ParseTree(new ConstantColumn((int64_t)addtime->get_sign()))); sptp.reset(new ParseTree(new ConstantColumn(sign)));
funcParms.push_back(sptp); funcParms.push_back(sptp);
} }

2
utils/funcexp/funcexp.cpp
View File

@@ -75,6 +75,8 @@ FuncExp::FuncExp()
fFuncMap["abs"] = new Func_abs(); fFuncMap["abs"] = new Func_abs();
fFuncMap["acos"] = new Func_acos(); fFuncMap["acos"] = new Func_acos();
fFuncMap["add_time"] = new Func_add_time(); fFuncMap["add_time"] = new Func_add_time();
fFuncMap["addtime"] = new Func_add_time();
fFuncMap["subtime"] = new Func_add_time();
fFuncMap["asin"] = new Func_asin(); fFuncMap["asin"] = new Func_asin();
fFuncMap["ascii"] = new Func_ascii(); fFuncMap["ascii"] = new Func_ascii();
fFuncMap["atan"] = new Func_atan(); fFuncMap["atan"] = new Func_atan();