Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb sql/item_func.cc: Auto merged
This commit is contained in:
commit
865cd0108a
@ -7128,7 +7128,7 @@ void ndb_serialize_cond(const Item *item, void *arg)
|
|||||||
Check that the field is part of the table of the handler
|
Check that the field is part of the table of the handler
|
||||||
instance and that we expect a field with of this result type.
|
instance and that we expect a field with of this result type.
|
||||||
*/
|
*/
|
||||||
if (context->table == field->table)
|
if (context->table->s == field->table->s)
|
||||||
{
|
{
|
||||||
const NDBTAB *tab= (const NDBTAB *) context->ndb_table;
|
const NDBTAB *tab= (const NDBTAB *) context->ndb_table;
|
||||||
DBUG_PRINT("info", ("FIELD_ITEM"));
|
DBUG_PRINT("info", ("FIELD_ITEM"));
|
||||||
|
@ -230,6 +230,8 @@ void Item_func::traverse_cond(Cond_traverser traverser,
|
|||||||
(*traverser)(this, argument);
|
(*traverser)(this, argument);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
(*traverser)(this, argument);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user