database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

MDEV-17749 Kill during LOCK TABLE ; ALTER TABLE causes assert

Browse Source 
The problem was that when LOCK TABLES where unwinded as part of
a killed connection, unlink_all_closed_tables() did not like that
there was uncommited transactions.
Fixed by doing a rollback of any open transaction in this particular case.
This commit is contained in:
Monty
2021-05-26 14:35:23 +03:00
parent 1864a8ea93
commit aa284e0237
3 changed files with 105 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
mysql-test/main/lock_kill.result Normal file
View File

@ -0,0 +1,36 @@
#
# MDEV-17749 Kill during LOCK TABLE ; ALTER TABLE causes assert
#
CREATE TABLE t1 (a INT) ENGINE=InnoDB;
connect con1,localhost,root,,test;
LOCK TABLE t1 WRITE;
ALTER TABLE t1 ADD COLUMN b INT;
connection default;
Killing connection
connection con1;
connection default;
disconnect con1;
DROP TABLE t1;
CREATE TABLE t1 (a INT) ENGINE=InnoDB;
CREATE TABLE t2 (a INT) ENGINE=InnoDB;
connect con1,localhost,root,,test;
LOCK TABLE t1 WRITE, t2 WRITE;
ALTER TABLE t1 ADD COLUMN b INT;
connection default;
Killing connection
connection con1;
connection default;
disconnect con1;
DROP TABLE t1, t2;
CREATE TABLE t1 (id int(11)) ENGINE=InnoDB;
LOCK TABLES t1 WRITE;
SET max_statement_time= 0.0001;
CREATE TRIGGER tr16 AFTER UPDATE ON t1 FOR EACH ROW INSERT INTO t1 VALUES (1);
SET max_statement_time= default;
DROP TRIGGER IF EXISTS trg16;
Warnings:
Note 1360 Trigger does not exist
DROP TABLE t1;
#
# End of 10.3 tests
#

59
mysql-test/main/lock_kill.test Normal file
View File

@ -0,0 +1,59 @@
--source include/have_innodb.inc
# This test file is for testing killing of queries that are under LOCK TABLES
--echo #
--echo # MDEV-17749 Kill during LOCK TABLE ; ALTER TABLE causes assert
--echo #
CREATE TABLE t1 (a INT) ENGINE=InnoDB;
--connect (con1,localhost,root,,test)
LOCK TABLE t1 WRITE;
--let $conid= `SELECT CONNECTION_ID()`
--send ALTER TABLE t1 ADD COLUMN b INT
--connection default
--disable_query_log
--echo Killing connection
eval KILL $conid;
--enable_query_log
--connection con1
--error 0,2013
reap;
--connection default
--disconnect con1
DROP TABLE t1;
CREATE TABLE t1 (a INT) ENGINE=InnoDB;
CREATE TABLE t2 (a INT) ENGINE=InnoDB;
--connect (con1,localhost,root,,test)
LOCK TABLE t1 WRITE, t2 WRITE;
--let $conid= `SELECT CONNECTION_ID()`
--send ALTER TABLE t1 ADD COLUMN b INT
--connection default
--disable_query_log
--echo Killing connection
eval KILL $conid;
--enable_query_log
--connection con1
--error 0,2013
reap;
--connection default
--disconnect con1
DROP TABLE t1, t2;
# Similar test for CREATE TRIGGER, which also failed
CREATE TABLE t1 (id int(11)) ENGINE=InnoDB;
LOCK TABLES t1 WRITE;
SET max_statement_time= 0.0001;
--error 0,1969
--disable_warnings
CREATE TRIGGER tr16 AFTER UPDATE ON t1 FOR EACH ROW INSERT INTO t1 VALUES (1);
--enable_warnings
SET max_statement_time= default;
DROP TRIGGER IF EXISTS trg16;
DROP TABLE t1;
--echo #
--echo # End of 10.3 tests
--echo #

10
sql/sql_base.cc
View File

@ -2469,7 +2469,17 @@ unlink_all_closed_tables(THD *thd, MYSQL_LOCK *lock, size_t reopen_count)
/* If no tables left, do an automatic UNLOCK TABLES */ /* If no tables left, do an automatic UNLOCK TABLES */
if (thd->lock && thd->lock->table_count == 0) if (thd->lock && thd->lock->table_count == 0)
{
/*
We have to rollback any open transactions here.
This is required in the case where the server has been killed
but some transations are still open (as part of locked tables).
If we don't do this, we will get an assert in unlock_locked_tables().
*/
ha_rollback_trans(thd, FALSE);
ha_rollback_trans(thd, TRUE);
unlock_locked_tables(thd); unlock_locked_tables(thd);
}
} }