mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 04:22:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'ob-10.0' into 10.0

Browse source
This commit is contained in:
Olivier Bertrand 2015-09-16 12:14:59 +02:00
commit 80d1237470
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
storage/connect/ha_connect.cc
View file

@ -2486,9 +2486,10 @@ PFIL ha_connect::CondFilter(PGLOBAL g, Item *cond)
if (!i && (ismul))
return NULL;
switch (args[i]->real_type()) {
switch (args[i]->real_type()) {
case COND::STRING_ITEM:
pp->Value= PlugSubAllocStr(g, NULL, res->ptr(), res->length());
res= pval->val_str(&tmp);
pp->Value= PlugSubAllocStr(g, NULL, res->ptr(), res->length());
pp->Type= (pp->Value) ? TYPE_STRING : TYPE_ERROR;
break;
case COND::INT_ITEM:
@ -2517,12 +2518,8 @@ PFIL ha_connect::CondFilter(PGLOBAL g, Item *cond)
return NULL;
} // endswitch type
// 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());
htrc("Value type=%hd\n", pp->Type);
// Append the value to the argument list
if (pprec)