revision-id: a535590ada1c437608c8a041aa6543f6f62c3ff2 (mariadb-10.10.1-7-ga535590) parent(s): f2611c41467b89bccd2d783da7b4b8bc4abea552 author: Igor Babaev committer: Igor Babaev timestamp: 2022-08-18 20:40:04 -0700 message: Applied the changes introduced in the commit 92a328099800486fe585a54d31ddf84c02ec6ae0 Author: Oleksandr Byelkin <sanja@mariadb.com> Tue Jul 12 00:25:08 2022 Committer: Oleksandr Byelkin <sanja@mariadb.com> Thu Jul 14 00:46:06 2022 for the code of MDEV-28883. --- sql/sql_delete.cc | 2 +- sql/sql_lex.cc | 2 +- sql/sql_lex.h | 9 --------- sql/sql_yacc.yy | 2 +- 4 files changed, 3 insertions(+), 12 deletions(-) diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc index 646f043..8acc502 100644 --- a/sql/sql_delete.cc +++ b/sql/sql_delete.cc @@ -1537,7 +1537,7 @@ bool Sql_cmd_delete::prepare_inner(THD *thd) } if (!(result= new (thd->mem_root) multi_delete(thd, aux_tables, - lex->table_count))) + lex->table_count_update))) { DBUG_RETURN(TRUE); } diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index bc11a51..8f9d042 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -1304,7 +1304,7 @@ void LEX::start(THD *thd_arg) wild= 0; exchange= 0; - table_count= 0; + table_count_update= 0; DBUG_VOID_RETURN; } diff --git a/sql/sql_lex.h b/sql/sql_lex.h index 44b33bb..4e16247 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -1774,15 +1774,6 @@ class Query_tables_list return (lock_tables_state == LTS_LOCKED); } - /** - Number of tables which were open by open_tables() and to be locked - by lock_tables(). - Note that we set this member only in some cases, when this value - needs to be passed from open_tables() to lock_tables() which are - separated by some amount of code. - */ - uint table_count; - /* These constructor and destructor serve for creation/destruction of Query_tables_list instances which are used as backup storage. diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 20b4086..13f0dbd 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -13385,7 +13385,7 @@ delete_single_table: MYSQL_YYABORT; Select->table_list.save_and_clear(&Lex->auxiliary_table_list); /* Save the number of auxiliary tables */ - Lex->table_count= 1; + Lex->table_count_update= 1; Lex->query_tables= 0; Lex->query_tables_last= &Lex->query_tables;