diff options
| author | unknown <monty@mashka.mysql.fi> | 2002-11-21 22:25:53 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2002-11-21 22:25:53 +0200 |
| commit | c58d9d9a9dda3037db574bbf97b22e7c1c274e02 (patch) | |
| tree | 54ccfe80d1405cb4325209020ea3c34d86a60770 /sql/item_cmpfunc.h | |
| parent | 33fc0d53b543032accea2476a4eed0522cead2bb (diff) | |
| download | mariadb-git-c58d9d9a9dda3037db574bbf97b22e7c1c274e02.tar.gz | |
Fixes after merge with 4.0
mysql-test/r/heap_btree.result:
Updated results
mysql-test/r/heap_hash.result:
Updated results
mysql-test/r/merge.result:
Updated results
mysql-test/r/rpl_log.result:
Updated results
mysql-test/r/select.result:
Updated results
mysql-test/r/subselect.result:
Updated results
sql/item_cmpfunc.h:
Fix after merge
sql/log_event.cc:
Fix after merge
sql/mysql_priv.h:
Fix after merge
sql/sql_acl.cc:
Fix after merge
sql/sql_class.cc:
Fix after merge
sql/sql_db.cc:
Fix after merge
sql/sql_delete.cc:
Fix after merge
sql/sql_lex.cc:
Fix after merge
sql/sql_lex.h:
Fix after merge
sql/sql_parse.cc:
Fix after merge
sql/sql_update.cc:
Fix after merge
sql/sql_yacc.yy:
Fix after merge
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 a9dc6c87f95..f94c520cc15 100644 --- a/sql/item_cmpfunc.h +++ b/sql/item_cmpfunc.h @@ -213,10 +213,10 @@ public: longlong val_int(); String *val_str(String *str); enum Item_result result_type () const { return cached_result_type; } - bool fix_fields(THD *thd,struct st_table_list *tlist) + bool fix_fields(THD *thd,struct st_table_list *tlist, Item **ref) { args[0]->top_level_item(); - return Item_func::fix_fields(thd,tlist); + return Item_func::fix_fields(thd, tlist, ref); } void fix_length_and_dec(); const char *func_name() const { return "if"; } |