database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-12-24 14:20:59 +03:00
Code Activity

Merge pull request #52 from mariadb-corporation/MCOL-385

Browse Source 
MCOL-385 Fix crash observed with 10.1.19 merge
This commit is contained in:
dhall-InfiniDB
2016-11-07 15:21:15 -06:00
committed by GitHub
parent df238a4e0f 14a9581bb6
commit 15d6cafb53
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
dbcon/mysql/ha_calpont_execplan.cpp
View File

@@ -4062,7 +4062,8 @@ void gp_walk(const Item *item, void *arg)
{
String val, *str = ifp->val_str(&val);
string valStr;
valStr.assign(str->ptr(), str->length());
if (str)
valStr.assign(str->ptr(), str->length());
ConstantColumn *cc = NULL;
if (!str) //@ bug 2844 check whether parameter is defined
{
@@ -5248,7 +5249,8 @@ int getSelectPlan(gp_walk_info& gwi, SELECT_LEX& select_lex, SCSEP& csep, bool i
{
String val, *str = ifp->val_str(&val);
string valStr;
valStr.assign(str->ptr(), str->length());
if (str)
valStr.assign(str->ptr(), str->length());
ConstantColumn *cc = NULL;
if (!str)
{