diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2019-09-22 23:23:28 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2019-10-14 10:29:30 +0200 |
| commit | a4a025f5d1aa123e31d86be82b79daa15a523b19 (patch) | |
| tree | cc018f627daa711bb2fd87a61c41b6d52aab886f /sql/sql_select.h | |
| parent | c7320830a62b0ed3245c476f074c534d3cd20027 (diff) | |
| download | mariadb-git-a4a025f5d1aa123e31d86be82b79daa15a523b19.tar.gz | |
cleanup: don't pass wild_num to setup_wild()
because internally setup_wild() adjusts select_lex->with_wild directly
anyway, so there is no reason to pretend that the number of '*' may be
anything else but select_lex->with_wild
And don't update select_lex->item_list, because fields can come
from anywhere and don't necessarily have to be copied into select_lex.
Diffstat (limited to 'sql/sql_select.h')
| -rw-r--r-- | sql/sql_select.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/sql/sql_select.h b/sql/sql_select.h index 4f7bf49f635..d440d79fbf5 100644 --- a/sql/sql_select.h +++ b/sql/sql_select.h @@ -1619,10 +1619,9 @@ public: return exec_join_tab_cnt() + aggr_tables - 1; } - int prepare(TABLE_LIST *tables, uint wind_num, - COND *conds, uint og_num, ORDER *order, bool skip_order_by, - ORDER *group, Item *having, ORDER *proc_param, SELECT_LEX *select, - SELECT_LEX_UNIT *unit); + int prepare(TABLE_LIST *tables, COND *conds, uint og_num, ORDER *order, + bool skip_order_by, ORDER *group, Item *having, + ORDER *proc_param, SELECT_LEX *select, SELECT_LEX_UNIT *unit); bool prepare_stage2(); int optimize(); int optimize_inner(); @@ -2096,8 +2095,7 @@ int join_read_key2(THD *thd, struct st_join_table *tab, TABLE *table, bool handle_select(THD *thd, LEX *lex, select_result *result, ulong setup_tables_done_option); -bool mysql_select(THD *thd, - TABLE_LIST *tables, uint wild_num, List<Item> &list, +bool mysql_select(THD *thd, TABLE_LIST *tables, List<Item> &list, COND *conds, uint og_num, ORDER *order, ORDER *group, Item *having, ORDER *proc_param, ulonglong select_type, select_result *result, SELECT_LEX_UNIT *unit, |