database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Fixes after merge with 4.0

Browse Source 
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
This commit is contained in:
unknown
2002-11-21 22:25:53 +02:00
parent 33fc0d53b5
commit c58d9d9a9d
18 changed files with 76 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/item_cmpfunc.h
View File

@ -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"; }