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

cleanup: don't pass wild_num to setup_wild()

Browse Source 
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.
This commit is contained in:
Sergei Golubchik
2019-09-22 23:23:28 +02:00
parent c7320830a6
commit a4a025f5d1
10 changed files with 39 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_delete.cc
View File

@ -1061,8 +1061,7 @@ int mysql_prepare_delete(THD *thd, TABLE_LIST *table_list,
DBUG_RETURN(true);
}
if ((wild_num && setup_wild(thd, table_list, field_list, NULL, wild_num,
&select_lex->hidden_bit_fields)) ||
if ((wild_num && setup_wild(thd, table_list, field_list, NULL, select_lex)) ||
setup_fields(thd, Ref_ptr_array(),
field_list, MARK_COLUMNS_READ, NULL, NULL, 0) ||
setup_conds(thd, table_list, select_lex->leaf_tables, conds) ||