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

Fixed assertion Assertion `!table->pos_in_locked_tables' failed

Browse Source 
MDEV-17717
Assertion `!table->pos_in_locked_tables' failed in tc_release_table on
flushing RocksDB table under SERIALIZABLE
MDEV-17998
Deadlock and eventual Assertion `!table->pos_in_locked_tables' failed
in tc_release_table on KILL_TIMEOUT
MDEV-19591
Assertion `!table->pos_in_locked_tables' failed in tc_release_table upon
altering table into S3 under lock.

The problem was that thd->open_tables->pos_in_locked_tables was not reset
when alter table failed to reopen a locked table.
This commit is contained in:
Monty
2019-08-08 20:10:00 +03:00
parent dbac2039e8
commit 6765cc6077
5 changed files with 54 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
mysql-test/r/kill.result
View File

@ -399,3 +399,20 @@ DROP USER u1@localhost;
SET DEBUG_SYNC = 'RESET'; SET DEBUG_SYNC = 'RESET';
DROP FUNCTION MY_KILL; DROP FUNCTION MY_KILL;
set global sql_mode=default; set global sql_mode=default;
#
# MDEV-17998
# Deadlock and eventual Assertion `!table->pos_in_locked_tables' failed
# in tc_release_table on KILL_TIMEOUT
#
SET max_statement_time= 2;
CREATE TABLE t1 (a INT);
CREATE VIEW v1 AS SELECT * FROM t1;
CREATE TABLE t2 (b INT, c INT);
LOCK TABLES v1 READ, t2 WRITE, t1 WRITE;
ALTER TABLE t1 CHANGE f1 f2 DOUBLE;
Got one of the listed errors
ALTER TABLE t2 DROP c;
ERROR 70100: Query execution was interrupted (max_statement_time exceeded)
UNLOCK TABLES;
DROP VIEW v1;
DROP TABLE t1, t2;

21
mysql-test/t/kill.test
View File

@ -642,3 +642,24 @@ SET DEBUG_SYNC = 'RESET';
DROP FUNCTION MY_KILL; DROP FUNCTION MY_KILL;
set global sql_mode=default; set global sql_mode=default;
--echo #
--echo # MDEV-17998
--echo # Deadlock and eventual Assertion `!table->pos_in_locked_tables' failed
--echo # in tc_release_table on KILL_TIMEOUT
--echo #
SET max_statement_time= 2;
CREATE TABLE t1 (a INT);
CREATE VIEW v1 AS SELECT * FROM t1;
CREATE TABLE t2 (b INT, c INT);
LOCK TABLES v1 READ, t2 WRITE, t1 WRITE;
--error ER_BAD_FIELD_ERROR,ER_STATEMENT_TIMEOUT
ALTER TABLE t1 CHANGE f1 f2 DOUBLE;
--error ER_STATEMENT_TIMEOUT
ALTER TABLE t2 DROP c;
UNLOCK TABLES;
DROP VIEW v1;
DROP TABLE t1, t2;

1
sql/sql_base.cc
View File

@ -2371,6 +2371,7 @@ unlink_all_closed_tables(THD *thd, MYSQL_LOCK *lock, size_t reopen_count)
DBUG_ASSERT(thd->open_tables == m_reopen_array[reopen_count]); DBUG_ASSERT(thd->open_tables == m_reopen_array[reopen_count]);
thd->open_tables->pos_in_locked_tables->table= NULL; thd->open_tables->pos_in_locked_tables->table= NULL;
thd->open_tables->pos_in_locked_tables= 0;
close_thread_table(thd, &thd->open_tables); close_thread_table(thd, &thd->open_tables);
} }

6
storage/rocksdb/mysql-test/rocksdb/r/kill.result Normal file
View File

@ -0,0 +1,6 @@
CREATE TABLE t1 (pk INT PRIMARY KEY) ENGINE=RocksDB;
LOCK TABLE t1 WRITE;
SET SESSION TRANSACTION ISOLATION LEVEL SERIALIZABLE;
FLUSH TABLES;
ERROR HY000: MyRocks supports only READ COMMITTED and REPEATABLE READ isolation levels. Please change from current isolation level SERIALIZABLE
DROP TABLE t1;

9
storage/rocksdb/mysql-test/rocksdb/t/kill.test Normal file
View File

@ -0,0 +1,9 @@
--source include/have_binlog_format_row.inc
--source include/have_rocksdb.inc
CREATE TABLE t1 (pk INT PRIMARY KEY) ENGINE=RocksDB;
LOCK TABLE t1 WRITE;
SET SESSION TRANSACTION ISOLATION LEVEL SERIALIZABLE;
--error ER_ISOLATION_MODE_NOT_SUPPORTED
FLUSH TABLES;
DROP TABLE t1;