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.
This commit is contained in:
parent
24f75b7f25
commit
11701780e0
@ -1543,7 +1543,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);
|
||||
}
|
||||
|
@ -1305,7 +1305,7 @@ void LEX::start(THD *thd_arg)
|
||||
wild= 0;
|
||||
exchange= 0;
|
||||
|
||||
table_count= 0;
|
||||
table_count_update= 0;
|
||||
|
||||
DBUG_VOID_RETURN;
|
||||
}
|
||||
|
@ -1780,15 +1780,6 @@ public:
|
||||
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.
|
||||
|
@ -13396,7 +13396,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;
|
||||
|
Loading…
x
Reference in New Issue
Block a user