diff options
| author | unknown <mskold/marty@mysql.com/linux.site> | 2007-04-03 14:00:38 +0200 |
|---|---|---|
| committer | unknown <mskold/marty@mysql.com/linux.site> | 2007-04-03 14:00:38 +0200 |
| commit | fda365101f70cc2de106a8cb7f37d7615bb55eb9 (patch) | |
| tree | ce7efd6e97ac99f86c9f270119d6537ab08a55e8 /sql/ha_ndbcluster.cc | |
| parent | c457e2b88b888ad8121e0c59c720e32e29d11b9e (diff) | |
| parent | 92602369b0307292dfd6e5bc357d42e09178b28e (diff) | |
| download | mariadb-git-fda365101f70cc2de106a8cb7f37d7615bb55eb9.tar.gz | |
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
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 a1b907e0e18..84352d75ffe 100644 --- a/sql/ha_ndbcluster.cc +++ b/sql/ha_ndbcluster.cc @@ -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 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")); |