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_delete.cc | |
| 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_delete.cc')
| -rw-r--r-- | sql/sql_delete.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc index 4488b4a92dd..d39bcaea299 100644 --- a/sql/sql_delete.cc +++ b/sql/sql_delete.cc @@ -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) || |