database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

MDEV-29664 Assertion `!n_mysql_tables_in_use' failed in innobase_close_connection

Browse Source 
When ha_end_bulk_insert() fails F_UNLCK was done twice: in
select_insert::prepare_eof() and in select_create::abort_result_set().

Now we avoid making F_UNLCK in prepare_eof() if error is non-zero.
This commit is contained in:
Aleksey Midenkov
2022-09-30 23:58:08 +03:00
parent d026447101
commit ba875e9396
5 changed files with 31 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mysql-test/main/create_or_replace2.result → mysql-test/main/create_replace_debug.result
View File

@ -91,3 +91,13 @@ ERROR HY000: Table 't2' was not locked with LOCK TABLES
unlock tables; unlock tables;
drop tables t1; drop tables t1;
set @@debug_dbug= @saved_debug_dbug; set @@debug_dbug= @saved_debug_dbug;
#
# MDEV-29664 Assertion `!n_mysql_tables_in_use' failed in innobase_close_connection
#
create table t1 (x int);
set @old_dbug= @@debug_dbug;
set @@debug_dbug= '+d,ha_end_bulk_insert_fail';
create or replace table t2 (y int) engine innodb select * from t1;
ERROR HY000: Out of memory.
set @@debug_dbug= @old_dbug;
drop table t1;

11
mysql-test/main/create_or_replace2.test → mysql-test/main/create_replace_debug.test
View File

@ -86,3 +86,14 @@ unlock tables;
drop tables t1; drop tables t1;
set @@debug_dbug= @saved_debug_dbug; set @@debug_dbug= @saved_debug_dbug;
--echo #
--echo # MDEV-29664 Assertion `!n_mysql_tables_in_use' failed in innobase_close_connection
--echo #
create table t1 (x int);
set @old_dbug= @@debug_dbug;
set @@debug_dbug= '+d,ha_end_bulk_insert_fail';
--error ER_OUT_OF_RESOURCES
create or replace table t2 (y int) engine innodb select * from t1;
set @@debug_dbug= @old_dbug;
drop table t1;

5
sql/handler.cc
View File

@ -5030,6 +5030,11 @@ int handler::ha_end_bulk_insert()
DBUG_ENTER("handler::ha_end_bulk_insert"); DBUG_ENTER("handler::ha_end_bulk_insert");
DBUG_EXECUTE_IF("crash_end_bulk_insert", DBUG_EXECUTE_IF("crash_end_bulk_insert",
{ extra(HA_EXTRA_FLUSH) ; DBUG_SUICIDE();}); { extra(HA_EXTRA_FLUSH) ; DBUG_SUICIDE();});
if (DBUG_IF("ha_end_bulk_insert_fail"))
{
my_error(ER_OUT_OF_RESOURCES, MYF(0));
DBUG_RETURN(HA_ERR_OUT_OF_MEM);
}
estimation_rows_to_insert= 0; estimation_rows_to_insert= 0;
DBUG_RETURN(end_bulk_insert()); DBUG_RETURN(end_bulk_insert());
} }

5
sql/sql_insert.cc
View File

@ -4285,7 +4285,7 @@ bool select_insert::prepare_eof()
table->file->extra(HA_EXTRA_NO_IGNORE_DUP_KEY); table->file->extra(HA_EXTRA_NO_IGNORE_DUP_KEY);
table->file->extra(HA_EXTRA_WRITE_CANNOT_REPLACE); table->file->extra(HA_EXTRA_WRITE_CANNOT_REPLACE);
if (atomic_replace) if (atomic_replace && !error)
{ {
DBUG_ASSERT(table->s->tmp_table); DBUG_ASSERT(table->s->tmp_table);
@ -5490,7 +5490,10 @@ void select_create::abort_result_set()
if (atomic_replace) if (atomic_replace)
{ {
ulonglong save_options_bits= thd->variables.option_bits;
thd->variables.option_bits|= OPTION_NOT_AUTOCOMMIT;
(void) table->file->ha_external_lock(thd, F_UNLCK); (void) table->file->ha_external_lock(thd, F_UNLCK);
thd->variables.option_bits= save_options_bits;
(void) thd->drop_temporary_table(table, NULL, true); (void) thd->drop_temporary_table(table, NULL, true);
} }
else else

1
storage/innobase/handler/ha_innodb.cc
View File

@ -16172,6 +16172,7 @@ ha_innobase::external_lock(
/* MySQL is releasing a table lock */ /* MySQL is releasing a table lock */
ut_ad(trx->n_mysql_tables_in_use);
trx->n_mysql_tables_in_use--; trx->n_mysql_tables_in_use--;
m_mysql_has_locked = false; m_mysql_has_locked = false;