diff options
| author | unknown <mskold/marty@linux.site> | 2007-02-09 16:33:52 +0100 |
|---|---|---|
| committer | unknown <mskold/marty@linux.site> | 2007-02-09 16:33:52 +0100 |
| commit | 4de01438d8ddef3b21dba0499f6b242559a9fb38 (patch) | |
| tree | efce2d7de5730ff836854179fc5ef6c90dc31ee0 /sql/ha_ndbcluster.cc | |
| parent | 0690e39b2a25d8378b3924d45e530d8bf037f4af (diff) | |
| parent | ef60c96f8bb7c8ab0c044750b39f56f1eb1953ea (diff) | |
| download | mariadb-git-4de01438d8ddef3b21dba0499f6b242559a9fb38.tar.gz | |
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1
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 940664b2660..7e30b8a9338 100644 --- a/sql/ha_ndbcluster.cc +++ b/sql/ha_ndbcluster.cc @@ -8870,7 +8870,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")); |