mirror of
https://github.com/MariaDB/server.git
synced 2025-01-20 22:12:30 +01:00
016928320d
The problem was that ALTER TABLE on a merge table which was locked using LOCK TABLE ... WRITE, by mistake gave ER_TABLE_NOT_LOCKED_FOR_WRITE. During opening of the table to be ALTERed, open_table() tried to get an upgradable metadata lock. In LOCK TABLEs mode, this lock must already exist (i.e. taken by LOCK TABLE) as new locks of this type cannot be acquired for fear of deadlock. So in LOCK TABLEs mode, open_table() tried to find an existing upgradable lock for the table to be altered. The problem was that open_table() also tried to find upgradable metadata locks for children of merge tables even if no such locks are needed to execute ALTER TABLE on merge tables. This patch fixes the problem by making sure that open tables code only searches for upgradable metadata locks for the merge table and not for the merge children tables. The patch also fixes a related bug where an upgradable metadata lock was aquired outside of LOCK TABLEs mode even if the table in question was temporary. This bug meant that LOCK TABLES or DDL on temporary tables by mistake could be blocked/aborted by locks held on base tables with the same table name by other connections. Test cases added to merge.test and lock_multi.test.
478 lines
12 KiB
Text
478 lines
12 KiB
Text
drop table if exists t1,t2;
|
|
create table t1(n int);
|
|
insert into t1 values (1);
|
|
select get_lock("mysqltest_lock", 100);
|
|
get_lock("mysqltest_lock", 100)
|
|
1
|
|
update t1 set n = 2 and get_lock('mysqltest_lock', 100);
|
|
update low_priority t1 set n = 4;
|
|
select n from t1;
|
|
select release_lock("mysqltest_lock");
|
|
release_lock("mysqltest_lock")
|
|
1
|
|
select release_lock("mysqltest_lock");
|
|
release_lock("mysqltest_lock")
|
|
1
|
|
n
|
|
4
|
|
drop table t1;
|
|
create table t1(n int);
|
|
insert into t1 values (1);
|
|
select get_lock("mysqltest_lock", 100);
|
|
get_lock("mysqltest_lock", 100)
|
|
1
|
|
select n from t1 where get_lock('mysqltest_lock', 100);
|
|
update low_priority t1 set n = 4;
|
|
select n from t1;
|
|
n
|
|
1
|
|
select release_lock("mysqltest_lock");
|
|
release_lock("mysqltest_lock")
|
|
1
|
|
n
|
|
1
|
|
select release_lock("mysqltest_lock");
|
|
release_lock("mysqltest_lock")
|
|
1
|
|
drop table t1;
|
|
create table t1 (a int, b int);
|
|
create table t2 (c int, d int);
|
|
insert into t1 values(1,1);
|
|
insert into t1 values(2,2);
|
|
insert into t2 values(1,2);
|
|
lock table t1 read;
|
|
update t1,t2 set c=a where b=d;
|
|
select c from t2;
|
|
c
|
|
2
|
|
unlock tables;
|
|
drop table t1;
|
|
drop table t2;
|
|
create table t1 (a int);
|
|
create table t2 (a int);
|
|
lock table t1 write, t2 write;
|
|
insert t1 select * from t2;
|
|
drop table t2;
|
|
unlock tables;
|
|
ERROR 42S02: Table 'test.t2' doesn't exist
|
|
drop table t1;
|
|
create table t1 (a int);
|
|
create table t2 (a int);
|
|
lock table t1 write, t2 write, t1 as t1_2 write, t2 as t2_2 write;
|
|
insert t1 select * from t2;
|
|
drop table t2;
|
|
unlock tables;
|
|
ERROR 42S02: Table 'test.t2' doesn't exist
|
|
drop table t1;
|
|
End of 4.1 tests
|
|
create table t1(a int);
|
|
lock tables t1 write;
|
|
show columns from t1;
|
|
Field Type Null Key Default Extra
|
|
a int(11) YES NULL
|
|
unlock tables;
|
|
drop table t1;
|
|
USE mysql;
|
|
LOCK TABLES columns_priv WRITE, db WRITE, host WRITE, user WRITE;
|
|
FLUSH TABLES;
|
|
USE mysql;
|
|
SELECT user.Select_priv FROM user, db WHERE user.user = db.user LIMIT 1;
|
|
OPTIMIZE TABLES columns_priv, db, host, user;
|
|
Table Op Msg_type Msg_text
|
|
mysql.columns_priv optimize status OK
|
|
mysql.db optimize status OK
|
|
mysql.host optimize status OK
|
|
mysql.user optimize status OK
|
|
UNLOCK TABLES;
|
|
Select_priv
|
|
N
|
|
USE test;
|
|
use test;
|
|
CREATE TABLE t1 (c1 int);
|
|
LOCK TABLE t1 WRITE;
|
|
FLUSH TABLES WITH READ LOCK;
|
|
CREATE TABLE t2 (c1 int);
|
|
ERROR HY000: Table 't2' was not locked with LOCK TABLES
|
|
UNLOCK TABLES;
|
|
UNLOCK TABLES;
|
|
DROP TABLE t1;
|
|
CREATE TABLE t1 (c1 int);
|
|
LOCK TABLE t1 WRITE;
|
|
FLUSH TABLES WITH READ LOCK;
|
|
CREATE TABLE t2 AS SELECT * FROM t1;
|
|
ERROR HY000: Table 't2' was not locked with LOCK TABLES
|
|
UNLOCK TABLES;
|
|
UNLOCK TABLES;
|
|
DROP TABLE t1;
|
|
CREATE DATABASE mysqltest_1;
|
|
FLUSH TABLES WITH READ LOCK;
|
|
DROP DATABASE mysqltest_1;
|
|
DROP DATABASE mysqltest_1;
|
|
ERROR HY000: Can't execute the query because you have a conflicting read lock
|
|
UNLOCK TABLES;
|
|
DROP DATABASE mysqltest_1;
|
|
ERROR HY000: Can't drop database 'mysqltest_1'; database doesn't exist
|
|
create table t1 (f1 int(12) unsigned not null auto_increment, primary key(f1)) engine=innodb;
|
|
lock tables t1 write;
|
|
alter table t1 auto_increment=0;
|
|
alter table t1 auto_increment=0;
|
|
unlock tables;
|
|
drop table t1;
|
|
create table t1 (a int);
|
|
create table t2 like t1;
|
|
# con1
|
|
lock tables t1 write;
|
|
# con2
|
|
flush tables with read lock;
|
|
# con5
|
|
# global read lock is taken
|
|
# con3
|
|
select * from t2 for update;
|
|
# waiting for release of read lock
|
|
# con4
|
|
# would hang and later cause a deadlock
|
|
flush tables t2;
|
|
# clean up
|
|
unlock tables;
|
|
unlock tables;
|
|
a
|
|
drop table t1,t2;
|
|
#
|
|
# Lightweight version:
|
|
# Ensure that the wait for a GRL is done before opening tables.
|
|
#
|
|
create table t1 (a int);
|
|
create table t2 like t1;
|
|
#
|
|
# UPDATE
|
|
#
|
|
# default
|
|
flush tables with read lock;
|
|
# con1
|
|
update t2 set a = 1;
|
|
# default
|
|
# statement is waiting for release of read lock
|
|
# con2
|
|
flush table t2;
|
|
# default
|
|
unlock tables;
|
|
# con1
|
|
#
|
|
# LOCK TABLES .. WRITE
|
|
#
|
|
# default
|
|
flush tables with read lock;
|
|
# con1
|
|
lock tables t2 write;
|
|
# default
|
|
# statement is waiting for release of read lock
|
|
# con2
|
|
flush table t2;
|
|
# default
|
|
unlock tables;
|
|
# con1
|
|
unlock tables;
|
|
drop table t1,t2;
|
|
End of 5.0 tests
|
|
create table t1 (i int);
|
|
lock table t1 read;
|
|
update t1 set i= 10;
|
|
select * from t1;
|
|
kill query ID;
|
|
i
|
|
ERROR 70100: Query execution was interrupted
|
|
unlock tables;
|
|
drop table t1;
|
|
drop table if exists t1;
|
|
create table t1 (a int) ENGINE=MEMORY;
|
|
--> client 2
|
|
handler t1 open;
|
|
ERROR HY000: Table storage engine for 't1' doesn't have this option
|
|
--> client 1
|
|
drop table t1;
|
|
drop table if exists t1;
|
|
create table t1 (i int);
|
|
connection: default
|
|
lock tables t1 write;
|
|
connection: flush
|
|
flush tables with read lock;;
|
|
connection: default
|
|
alter table t1 add column j int;
|
|
connection: insert
|
|
insert into t1 values (1,2);;
|
|
connection: default
|
|
unlock tables;
|
|
connection: flush
|
|
select * from t1;
|
|
i j
|
|
unlock tables;
|
|
select * from t1;
|
|
i j
|
|
1 2
|
|
drop table t1;
|
|
drop table if exists t1;
|
|
create table t1 (i int);
|
|
connection: default
|
|
lock tables t1 write;
|
|
connection: flush
|
|
flush tables with read lock;;
|
|
connection: default
|
|
flush tables;
|
|
unlock tables;
|
|
drop table t1;
|
|
drop table if exists t1,t2;
|
|
create table t1 (a int);
|
|
flush status;
|
|
lock tables t1 read;
|
|
insert into t1 values(1);
|
|
unlock tables;
|
|
drop table t1;
|
|
select @tlwa < @tlwb;
|
|
@tlwa < @tlwb
|
|
1
|
|
End of 5.1 tests
|
|
drop table if exists t1;
|
|
create table t1 (i int);
|
|
connection: default
|
|
lock tables t1 write;
|
|
connection: flush
|
|
flush tables with read lock;;
|
|
connection: default
|
|
flush tables;
|
|
drop table t1;
|
|
#
|
|
# Test for bug #46272 "MySQL 5.4.4, new MDL: unnecessary deadlock".
|
|
#
|
|
drop table if exists t1;
|
|
create table t1 (c1 int primary key, c2 int, c3 int);
|
|
insert into t1 values (1,1,0),(2,2,0),(3,3,0),(4,4,0),(5,5,0);
|
|
begin;
|
|
update t1 set c3=c3+1 where c2=3;
|
|
#
|
|
# Switching to connection 'con46272'.
|
|
# The below ALTER TABLE statement should wait till transaction
|
|
# in connection 'default' is complete and then succeed.
|
|
# It should not deadlock or fail with ER_LOCK_DEADLOCK error.
|
|
# Sending:
|
|
alter table t1 add column c4 int;;
|
|
#
|
|
# Switching to connection 'default'.
|
|
# Wait until the above ALTER TABLE gets blocked because this
|
|
# connection holds SW metadata lock on table to be altered.
|
|
# The below statement should succeed. It should not
|
|
# deadlock or end with ER_LOCK_DEADLOCK error.
|
|
update t1 set c3=c3+1 where c2=4;
|
|
# Unblock ALTER TABLE by committing transaction.
|
|
commit;
|
|
#
|
|
# Switching to connection 'con46272'.
|
|
# Reaping ALTER TABLE.
|
|
#
|
|
# Switching to connection 'default'.
|
|
drop table t1;
|
|
#
|
|
# Bug#47249 assert in MDL_global_lock::is_lock_type_compatible
|
|
#
|
|
DROP TABLE IF EXISTS t1;
|
|
DROP VIEW IF EXISTS v1;
|
|
#
|
|
# Test 1: LOCK TABLES v1 WRITE, t1 READ;
|
|
#
|
|
# Thanks to the fact that we no longer allow DDL on tables
|
|
# which are locked for write implicitly, the exact scenario
|
|
# in which assert was failing is no longer repeatable.
|
|
CREATE TABLE t1 ( f1 integer );
|
|
CREATE VIEW v1 AS SELECT f1 FROM t1 ;
|
|
LOCK TABLES v1 WRITE, t1 READ;
|
|
FLUSH TABLE t1;
|
|
ERROR HY000: Table 't1' was locked with a READ lock and can't be updated
|
|
UNLOCK TABLES;
|
|
DROP TABLE t1;
|
|
DROP VIEW v1;
|
|
#
|
|
# Test 2: LOCK TABLES t1 WRITE, v1 READ;
|
|
#
|
|
CREATE TABLE t1 ( f1 integer );
|
|
CREATE VIEW v1 AS SELECT f1 FROM t1 ;
|
|
# Connection 2
|
|
LOCK TABLES t1 WRITE, v1 READ;
|
|
FLUSH TABLE t1;
|
|
# Connection 1
|
|
LOCK TABLES t1 WRITE;
|
|
FLUSH TABLE t1;
|
|
DROP TABLE t1;
|
|
DROP VIEW v1;
|
|
#
|
|
# Test for bug #50913 "Deadlock between open_and_lock_tables_derived
|
|
# and MDL". Also see additional coverage in mdl_sync.test.
|
|
#
|
|
drop table if exists t1;
|
|
drop view if exists v1;
|
|
create table t1 (i int);
|
|
create view v1 as select i from t1;
|
|
begin;
|
|
select * from t1;
|
|
i
|
|
# Switching to connection 'con50913'.
|
|
# Sending:
|
|
alter table t1 add column j int;
|
|
# Switching to connection 'default'.
|
|
# Wait until ALTER TABLE gets blocked.
|
|
# The below statement should try to acquire SW lock on 't1'
|
|
# and therefore should get ER_LOCK_DEADLOCK error. Before
|
|
# bug fix it acquired SR lock and hung on thr_lock.c lock.
|
|
delete a from t1 as a where i = 1;
|
|
ERROR 40001: Deadlock found when trying to get lock; try restarting transaction
|
|
# Unblock ALTER TABLE.
|
|
commit;
|
|
# Switching to connection 'con50913'.
|
|
# Reaping ALTER TABLE;
|
|
# Switching to connection 'default'.
|
|
begin;
|
|
select * from v1;
|
|
i
|
|
# Switching to connection 'con50913'.
|
|
# Sending:
|
|
alter table t1 drop column j;
|
|
# Switching to connection 'default'.
|
|
# Wait until ALTER TABLE gets blocked.
|
|
# The below statement should try to acquire SW lock on 't1'
|
|
# and therefore should get ER_LOCK_DEADLOCK error. Before
|
|
# bug fix it acquired SR lock and hung on thr_lock.c lock.
|
|
insert into v1 values (1);
|
|
ERROR 40001: Deadlock found when trying to get lock; try restarting transaction
|
|
# Unblock ALTER TABLE.
|
|
commit;
|
|
# Switching to connection 'con50913'.
|
|
# Reaping ALTER TABLE;
|
|
# Switching to connection 'default'.
|
|
drop view v1;
|
|
drop table t1;
|
|
#
|
|
# Bug#45225 Locking: hang if drop table with no timeout
|
|
#
|
|
# These tests also provide function coverage for the
|
|
# lock_wait_timeout server variable.
|
|
#
|
|
DROP TABLE IF EXISTS t1;
|
|
CREATE TABLE t1 (id int);
|
|
SET SESSION lock_wait_timeout= 1;
|
|
#
|
|
# Test 1: acquire exclusive lock
|
|
#
|
|
# Connection default
|
|
START TRANSACTION;
|
|
INSERT INTO t1 VALUES (1);
|
|
# Connection 2
|
|
DROP TABLE t1;
|
|
ERROR HY000: Lock wait timeout exceeded; try restarting transaction
|
|
# Connection default
|
|
COMMIT;
|
|
#
|
|
# Test 2: upgrade shared lock
|
|
#
|
|
# Connection default
|
|
START TRANSACTION;
|
|
SELECT * FROM t1;
|
|
id
|
|
1
|
|
# Connection 2
|
|
ALTER TABLE t1 RENAME TO t2;
|
|
ERROR HY000: Lock wait timeout exceeded; try restarting transaction
|
|
# Connection default
|
|
COMMIT;
|
|
#
|
|
# Test 3: acquire shared lock
|
|
#
|
|
# Connection default
|
|
LOCK TABLE t1 WRITE;
|
|
# Connection 2
|
|
INSERT INTO t1(id) VALUES (2);
|
|
ERROR HY000: Lock wait timeout exceeded; try restarting transaction
|
|
# Connection default
|
|
UNLOCK TABLES;
|
|
#
|
|
# Test 4: table level locks
|
|
#
|
|
# Connection default
|
|
LOCK TABLE t1 READ;
|
|
# Connection 2
|
|
INSERT INTO t1(id) VALUES(4);
|
|
ERROR HY000: Lock wait timeout exceeded; try restarting transaction
|
|
# Connection default
|
|
UNLOCK TABLES;
|
|
#
|
|
# Test 5: Waiting on Table Definition Cache (TDC)
|
|
#
|
|
# Connection default
|
|
LOCK TABLE t1 READ;
|
|
# Connection con3
|
|
# Sending:
|
|
FLUSH TABLES;
|
|
# Connection con2
|
|
SELECT * FROM t1;
|
|
ERROR HY000: Lock wait timeout exceeded; try restarting transaction
|
|
# Connection default
|
|
UNLOCK TABLES;
|
|
# Connection con3
|
|
# Reaping: FLUSH TABLES
|
|
#
|
|
# Test 6: Timeouts in I_S queries
|
|
#
|
|
# Connection default
|
|
CREATE TABLE t2 (id INT);
|
|
LOCK TABLE t2 WRITE;
|
|
# Connection con3
|
|
# Sending:
|
|
DROP TABLE t1, t2;
|
|
# Connection con2
|
|
SELECT table_name, table_comment FROM information_schema.tables
|
|
WHERE table_schema= 'test' AND table_name= 't1';
|
|
table_name table_comment
|
|
t1 Lock wait timeout exceeded; try restarting transaction
|
|
# Connection default
|
|
UNLOCK TABLES;
|
|
# Connection con3
|
|
# Reaping: DROP TABLE t1, t2
|
|
# Connection default
|
|
# Cleanup
|
|
#
|
|
# Test for bug #51134 "Crash in MDL_lock::destroy on a concurrent
|
|
# DDL workload".
|
|
#
|
|
drop tables if exists t1, t2, t3;
|
|
create table t3 (i int);
|
|
# Switching to connection 'con1'
|
|
# Lock 't3' so upcoming RENAME is blocked.
|
|
lock table t3 read;
|
|
# Switching to connection 'con2'
|
|
# Remember ID for this connection.
|
|
# Start statement which will try to acquire two instances
|
|
# of X metadata lock on the same object.
|
|
# Sending:
|
|
rename tables t1 to t2, t2 to t3;;
|
|
# Switching to connection 'default'
|
|
# Wait until RENAME TABLE is blocked on table 't3'.
|
|
# Kill RENAME TABLE.
|
|
kill query ID;
|
|
# Switching to connection 'con2'
|
|
# RENAME TABLE should be aborted but should not crash.
|
|
ERROR 70100: Query execution was interrupted
|
|
# Switching to connection 'con1'
|
|
unlock tables;
|
|
# Switching to connection 'default'
|
|
drop table t3;
|
|
#
|
|
# Test for the bug where upgradable metadata locks was acquired
|
|
# even if the table to altered was temporary.
|
|
# Bug found while working on the related bug #51240.
|
|
#
|
|
DROP TABLE IF EXISTS t1;
|
|
CREATE TABLE t1 (id INT);
|
|
LOCK TABLE t1 WRITE;
|
|
# Connection con1
|
|
CREATE TEMPORARY TABLE t1 (id INT);
|
|
ALTER TABLE t1 ADD COLUMN j INT;
|
|
# Connection default
|
|
UNLOCK TABLES;
|
|
DROP TABLE t1;
|