diff options
| author | unknown <bell@sanja.is.com.ua> | 2003-01-28 15:34:59 +0200 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2003-01-28 15:34:59 +0200 |
| commit | d7db6beec7e108290311f92107573e4506f680d8 (patch) | |
| tree | b673163c5e5a1954a4b6351b9c75fc6ff05e31a0 /sql/item_cmpfunc.h | |
| parent | 7120b6688481605551408afd5c3ea5501658e9d8 (diff) | |
| parent | ca0d06d599c7e174927a75720974dc457968be23 (diff) | |
| download | mariadb-git-d7db6beec7e108290311f92107573e4506f680d8.tar.gz | |
Merge
sql/item.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/item.h:
SCCS merged
Diffstat (limited to 'sql/item_cmpfunc.h')
| -rw-r--r-- | sql/item_cmpfunc.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sql/item_cmpfunc.h b/sql/item_cmpfunc.h index 1bb85a9e233..b003be06cb7 100644 --- a/sql/item_cmpfunc.h +++ b/sql/item_cmpfunc.h @@ -17,8 +17,6 @@ /* compare and test functions */ -#include "assert.h" - #ifdef __GNUC__ #pragma interface /* gcc class implementation */ #endif @@ -637,7 +635,7 @@ class Item_func_in :public Item_int_func enum Functype functype() const { return IN_FUNC; } const char *func_name() const { return " IN "; } void update_used_tables(); - void split_sum_func(List<Item> &fields); + void split_sum_func(Item **ref_pointer_array, List<Item> &fields); bool check_loop(uint id) { DBUG_ENTER("Item_func_in::check_loop"); @@ -788,7 +786,7 @@ public: table_map used_tables() const; void update_used_tables(); void print(String *str); - void split_sum_func(List<Item> &fields); + void split_sum_func(Item **ref_pointer_array, List<Item> &fields); friend int setup_conds(THD *thd,TABLE_LIST *tables,COND **conds); bool check_loop(uint id); void top_level_item() { abort_on_null=1; } |