diff options
| author | monty@mysql.com <> | 2006-06-04 21:05:22 +0300 |
|---|---|---|
| committer | monty@mysql.com <> | 2006-06-04 21:05:22 +0300 |
| commit | c46fb742b82d9e894fc8ec92ec18b804af48b1b2 (patch) | |
| tree | 8e3365da0e05942d80e6e6ae092f7e0e40832fe2 /sql/item_cmpfunc.h | |
| parent | b615e0b6dca974678ea6f9610f42ed4dbeb1bfe5 (diff) | |
| parent | 74cc73d4619c94ceb1b93725b1bba7b802f2290d (diff) | |
| download | mariadb-git-c46fb742b82d9e894fc8ec92ec18b804af48b1b2.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/home/my/mysql-5.1
Diffstat (limited to 'sql/item_cmpfunc.h')
| -rw-r--r-- | sql/item_cmpfunc.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item_cmpfunc.h b/sql/item_cmpfunc.h index f7da1e5e297..8bd1b53e226 100644 --- a/sql/item_cmpfunc.h +++ b/sql/item_cmpfunc.h @@ -1178,7 +1178,7 @@ public: COND **conds); void top_level_item() { abort_on_null=1; } void copy_andor_arguments(THD *thd, Item_cond *item); - bool walk(Item_processor processor, byte *arg); + bool walk(Item_processor processor, bool walk_subquery, byte *arg); Item *transform(Item_transformer transformer, byte *arg); void traverse_cond(Cond_traverser, void *arg, traverse_order order); void neg_arguments(THD *thd); @@ -1292,7 +1292,7 @@ public: void fix_length_and_dec(); bool fix_fields(THD *thd, Item **ref); void update_used_tables(); - bool walk(Item_processor processor, byte *arg); + bool walk(Item_processor processor, bool walk_subquery, byte *arg); Item *transform(Item_transformer transformer, byte *arg); void print(String *str); CHARSET_INFO *compare_collation() |