diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2022-07-12 09:25:08 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2022-07-14 09:46:06 +0200 |
| commit | 92a328099800486fe585a54d31ddf84c02ec6ae0 (patch) | |
| tree | c4ba021d48bf91b26f589e55209eded29fec5d60 /sql/sql_parse.cc | |
| parent | 49e14000eeb245ea27e9207d2f63cb0a28be1ca9 (diff) | |
| download | mariadb-git-92a328099800486fe585a54d31ddf84c02ec6ae0.tar.gz | |
table_count was present twice in one class of LEX.
Remove table_count from Query_tables_list (not used, moved to MYSQL_LOCK).
Rename table_count from LEX to avoid mixing it with other counters of tables.
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index df31862a92f..e9d2f2074b5 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -4758,7 +4758,7 @@ mysql_execute_command(THD *thd) if (likely(!thd->is_fatal_error)) { result= new (thd->mem_root) multi_delete(thd, aux_tables, - lex->table_count); + lex->table_count_update); if (likely(result)) { if (unlikely(select_lex->vers_setup_conds(thd, aux_tables))) @@ -9532,12 +9532,12 @@ bool multi_delete_set_locks_and_link_aux_tables(LEX *lex) TABLE_LIST *target_tbl; DBUG_ENTER("multi_delete_set_locks_and_link_aux_tables"); - lex->table_count= 0; + lex->table_count_update= 0; for (target_tbl= lex->auxiliary_table_list.first; target_tbl; target_tbl= target_tbl->next_local) { - lex->table_count++; + lex->table_count_update++; /* All tables in aux_tables must be found in FROM PART */ TABLE_LIST *walk= multi_delete_table_match(lex, target_tbl, tables); if (!walk) |