diff options
| author | unknown <mskold/marty@mysql.com/linux.site> | 2007-03-24 08:21:59 +0100 |
|---|---|---|
| committer | unknown <mskold/marty@mysql.com/linux.site> | 2007-03-24 08:21:59 +0100 |
| commit | 92602369b0307292dfd6e5bc357d42e09178b28e (patch) | |
| tree | c1c3c06b662f3e80281260337cc28dbd4b89ee5c /sql/ha_ndbcluster.cc | |
| parent | ac3b8a79ef7209ce983435fa08cb61a1c73757a9 (diff) | |
| parent | ef60c96f8bb7c8ab0c044750b39f56f1eb1953ea (diff) | |
| download | mariadb-git-92602369b0307292dfd6e5bc357d42e09178b28e.tar.gz | |
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
sql/ha_ndbcluster.cc:
Auto merged
sql/item_func.cc:
Auto merged
Diffstat (limited to 'sql/ha_ndbcluster.cc')
| -rw-r--r-- | sql/ha_ndbcluster.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc index 5f44530b2db..c9a7f93d7d8 100644 --- a/sql/ha_ndbcluster.cc +++ b/sql/ha_ndbcluster.cc @@ -7104,7 +7104,7 @@ void ndb_serialize_cond(const Item *item, void *arg) Check that the field is part of the table of the handler 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; DBUG_PRINT("info", ("FIELD_ITEM")); |