mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-05 22:55:32 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'ob-10.0' into 10.0

Browse source
This commit is contained in:
Olivier Bertrand 2015-09-09 01:28:04 +02:00
commit d69931eec2
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
storage/connect/ha_connect.cc
View file

@ -2486,9 +2486,6 @@ PFIL ha_connect::CondFilter(PGLOBAL g, Item *cond)
if (!i && (ismul))
return NULL;
if ((res= pval->val_str(&tmp)) == NULL)
return NULL; // To be clarified
switch (args[i]->real_type()) {
case COND::STRING_ITEM:
pp->Value= PlugSubAllocStr(g, NULL, res->ptr(), res->length());
@ -2520,7 +2517,11 @@ PFIL ha_connect::CondFilter(PGLOBAL g, Item *cond)
return NULL;
} // endswitch type
if (trace)
// This was moved because cannot be done for FUNC_ITEM
if ((res= pval->val_str(&tmp)) == NULL)
return NULL; // To be clarified
if (trace)
htrc("Value=%.*s\n", res->length(), res->ptr());
// Append the value to the argument list