mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
After merge fixes
Added THD to add_to_xxx_list() functions for faster parsing. heap/_check.c: After merge fix mysql-test/r/distinct.result: After merge fix mysql-test/r/multi_update.result: Make timestamp test portable mysql-test/t/multi_update.test: Make timestamp test portable sql/field.cc: After merge fix sql/item_sum.cc: After merge fix sql/log_event.cc: Remove compiler warning sql/mysql_priv.h: Added THD to add_to_list (Faster parsing) sql/sql_derived.cc: Fixed parameters to create_tmp_table() sql/sql_lex.cc: Added THD to add_to_list (Faster parsing) sql/sql_lex.h: Added THD to add_to_list (Faster parsing) sql/sql_parse.cc: Added THD to add_to_list (Faster parsing) sql/sql_select.cc: After merge fixes Fixed return values from JOIN::optimize() Replaced test_function_query with '!tables_list' Optimized arguments to create_tmp_table() sql/sql_select.h: Removed test_function_query variable Updated prototypes sql/sql_union.cc: Updated argument lists. sql/sql_update.cc: After merge fixes sql/sql_yacc.yy: Added THD to all add_xxx_to_list() functions sql/table.h: After merge fix
This commit is contained in:
@ -227,9 +227,9 @@ public:
|
||||
void exclude();
|
||||
|
||||
virtual st_select_lex* select_lex();
|
||||
virtual bool add_item_to_list(Item *item);
|
||||
bool add_order_to_list(Item *item, bool asc);
|
||||
virtual bool add_group_to_list(Item *item, bool asc);
|
||||
virtual bool add_item_to_list(THD *thd, Item *item);
|
||||
bool add_order_to_list(THD *thd, Item *item, bool asc);
|
||||
virtual bool add_group_to_list(THD *thd, Item *item, bool asc);
|
||||
virtual bool add_ftfunc_to_list(Item_func_match *func);
|
||||
|
||||
virtual st_select_lex_unit* master_unit()= 0;
|
||||
@ -242,7 +242,7 @@ public:
|
||||
virtual List<Item>* get_item_list();
|
||||
virtual List<String>* get_use_index();
|
||||
virtual List<String>* get_ignore_index();
|
||||
virtual TABLE_LIST *add_table_to_list(Table_ident *table,
|
||||
virtual TABLE_LIST *add_table_to_list(THD *thd, Table_ident *table,
|
||||
LEX_STRING *alias,
|
||||
bool updating,
|
||||
thr_lock_type flags= TL_UNLOCK,
|
||||
@ -363,15 +363,15 @@ public:
|
||||
uint get_in_sum_expr();
|
||||
|
||||
st_select_lex* select_lex();
|
||||
bool add_item_to_list(Item *item);
|
||||
bool add_group_to_list(Item *item, bool asc);
|
||||
bool add_item_to_list(THD *thd, Item *item);
|
||||
bool add_group_to_list(THD *thd, Item *item, bool asc);
|
||||
bool add_ftfunc_to_list(Item_func_match *func);
|
||||
|
||||
TABLE_LIST* get_table_list();
|
||||
List<Item>* get_item_list();
|
||||
List<String>* get_use_index();
|
||||
List<String>* get_ignore_index();
|
||||
TABLE_LIST* add_table_to_list(Table_ident *table,
|
||||
TABLE_LIST* add_table_to_list(THD *thd, Table_ident *table,
|
||||
LEX_STRING *alias,
|
||||
bool updating,
|
||||
thr_lock_type flags= TL_UNLOCK,
|
||||
|
Reference in New Issue
Block a user