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

Merge branch 'develop-1.1' into dev-merge-up-20180409

Browse Source
This commit is contained in:
Andrew Hutchings
2018-04-09 19:15:18 +01:00
parent 7075b9571d 3eb36e6bf9
commit 280dcb44bf
31 changed files with 304 additions and 257 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
utils/funcexp/func_case.cpp
View File

@ -489,6 +489,14 @@ bool Func_searched_case::getBoolVal(Row& row,
if (isNull)
return joblist::BIGINTNULL;
ParseTree* lop = parm[i + 1]->left();
ParseTree* rop = parm[i + 1]->right();
if (lop && rop)
{
return (reinterpret_cast<Operator*>(parm[i + 1]->data()))->getBoolVal(row, isNull, lop, rop);
}
return parm[i + 1]->data()->getBoolVal(row, isNull);
}