diff options
| author | unknown <mskold/marty@mysql.com/linux.site> | 2007-04-05 08:24:03 +0200 |
|---|---|---|
| committer | unknown <mskold/marty@mysql.com/linux.site> | 2007-04-05 08:24:03 +0200 |
| commit | 865cd0108a718d0231daf98367f64fce0c46d3f3 (patch) | |
| tree | 504b4a6f2bf19d65bb4b87df6c3f53b64d4abe74 | |
| parent | b651aa038c1a7fa5197c2746672bd22863b12132 (diff) | |
| parent | fda365101f70cc2de106a8cb7f37d7615bb55eb9 (diff) | |
| download | mariadb-git-865cd0108a718d0231daf98367f64fce0c46d3f3.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/item_func.cc:
Auto merged
| -rw-r--r-- | sql/ha_ndbcluster.cc | 2 | ||||
| -rw-r--r-- | sql/item_func.cc | 2 |
2 files changed, 3 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")); diff --git a/sql/item_func.cc b/sql/item_func.cc index 25aaf824915..3da3996e94c 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -230,6 +230,8 @@ void Item_func::traverse_cond(Cond_traverser traverser, (*traverser)(this, argument); } } + else + (*traverser)(this, argument); } |