diff options
| author | unknown <bell@sanja.is.com.ua> | 2004-11-21 20:08:12 +0200 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2004-11-21 20:08:12 +0200 |
| commit | 5a00a868b74ffb6b220eb72c87ec38696ce9406c (patch) | |
| tree | 76a673d7a9b20f184988993cc14ce455b1d73f70 /sql/item_cmpfunc.h | |
| parent | 436c7714dd6df991f2e968b313906d4b1e70db97 (diff) | |
| parent | c9497e2365461fb2547a8cfceb33b68a99d7fe0b (diff) | |
| download | mariadb-git-5a00a868b74ffb6b220eb72c87ec38696ce9406c.tar.gz | |
merge
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/opt_sum.cc:
Auto merged
sql/sp.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_help.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_view.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/item_cmpfunc.h')
| -rw-r--r-- | sql/item_cmpfunc.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/item_cmpfunc.h b/sql/item_cmpfunc.h index 02d5f6a1f7a..35ce494257b 100644 --- a/sql/item_cmpfunc.h +++ b/sql/item_cmpfunc.h @@ -959,7 +959,8 @@ public: void update_used_tables(); void print(String *str); void split_sum_func(THD *thd, Item **ref_pointer_array, List<Item> &fields); - friend int setup_conds(THD *thd,TABLE_LIST *tables,COND **conds); + friend int setup_conds(THD *thd, TABLE_LIST *tables, TABLE_LIST *leaves, + 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); |