1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb

Browse Source 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb


sql/item_func.cc:
  Auto merged
This commit is contained in:
unknown 2007-04-05 08:24:03 +02:00
commit 865cd0108a
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sql/ha_ndbcluster.cc
View File

@ -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"));

2
sql/item_func.cc
View File

@ -230,6 +230,8 @@ void Item_func::traverse_cond(Cond_traverser traverser,
(*traverser)(this, argument); (*traverser)(this, argument);
} }
} }
else
(*traverser)(this, argument);
} }