mirror of
https://github.com/MariaDB/server.git
synced 2025-01-20 22:12:30 +01:00
69b9761f29
Backport of: ------------------------------------------------------------ revno: 2630.4.1 committer: Dmitry Lenev <dlenev@mysql.com> branch nick: mysql-6.0-3726-w timestamp: Fri 2008-05-23 17:54:03 +0400 message: WL#3726 "DDL locking for all metadata objects". After review fixes in progress. ------------------------------------------------------------ This is the first patch in series. It transforms the metadata locking subsystem to use a dedicated module (mdl.h,cc). No significant changes in the locking protocol. The import passes the test suite with the exception of deprecated/removed 6.0 features, and MERGE tables. The latter are subject to a fix by WL#4144. Unfortunately, the original changeset comments got lost in a merge, thus this import has its own (largely insufficient) comments. This patch fixes Bug#25144 "replication / binlog with view breaks". Warning: this patch introduces an incompatible change: Under LOCK TABLES, it's no longer possible to FLUSH a table that was not locked for WRITE. Under LOCK TABLES, it's no longer possible to DROP a table or VIEW that was not locked for WRITE. ****** Backport of: ------------------------------------------------------------ revno: 2630.4.2 committer: Dmitry Lenev <dlenev@mysql.com> branch nick: mysql-6.0-3726-w timestamp: Sat 2008-05-24 14:03:45 +0400 message: WL#3726 "DDL locking for all metadata objects". After review fixes in progress. ****** Backport of: ------------------------------------------------------------ revno: 2630.4.3 committer: Dmitry Lenev <dlenev@mysql.com> branch nick: mysql-6.0-3726-w timestamp: Sat 2008-05-24 14:08:51 +0400 message: WL#3726 "DDL locking for all metadata objects" Fixed failing Windows builds by adding mdl.cc to the lists of files needed to build server/libmysqld on Windows. ****** Backport of: ------------------------------------------------------------ revno: 2630.4.4 committer: Dmitry Lenev <dlenev@mysql.com> branch nick: mysql-6.0-3726-w timestamp: Sat 2008-05-24 21:57:58 +0400 message: WL#3726 "DDL locking for all metadata objects". Fix for assert failures in kill.test which occured when one tried to kill ALTER TABLE statement on merge table while it was waiting in wait_while_table_is_used() for other connections to close this table. These assert failures stemmed from the fact that cleanup code in this case assumed that temporary table representing new version of table was open with adding to THD::temporary_tables list while code which were opening this temporary table wasn't always fulfilling this. This patch changes code that opens new version of table to always do this linking in. It also streamlines cleanup process for cases when error occurs while we have new version of table open. ****** WL#3726 "DDL locking for all metadata objects" Add libmysqld/mdl.cc to .bzrignore. ****** Backport of: ------------------------------------------------------------ revno: 2630.4.6 committer: Dmitry Lenev <dlenev@mysql.com> branch nick: mysql-6.0-3726-w timestamp: Sun 2008-05-25 00:33:22 +0400 message: WL#3726 "DDL locking for all metadata objects". Addition to the fix of assert failures in kill.test caused by changes for this worklog. Make sure we close the new table only once.
244 lines
7.1 KiB
Text
244 lines
7.1 KiB
Text
set @old_concurrent_insert= @@global.concurrent_insert;
|
|
set @@global.concurrent_insert= 0;
|
|
drop table if exists t1, t2, t3;
|
|
create table t1 (kill_id int);
|
|
insert into t1 values(connection_id());
|
|
select ((@id := kill_id) - kill_id) from t1;
|
|
((@id := kill_id) - kill_id)
|
|
0
|
|
kill @id;
|
|
select ((@id := kill_id) - kill_id) from t1;
|
|
((@id := kill_id) - kill_id)
|
|
0
|
|
select @id != connection_id();
|
|
@id != connection_id()
|
|
1
|
|
select 4;
|
|
4
|
|
4
|
|
drop table t1;
|
|
kill (select count(*) from mysql.user);
|
|
ERROR 42000: This version of MySQL doesn't yet support 'Usage of subqueries or stored function calls as part of this statement'
|
|
create table t1 (id int primary key);
|
|
create table t2 (id int unsigned not null);
|
|
insert into t2 select id from t1;
|
|
create table t3 (kill_id int);
|
|
insert into t3 values(connection_id());
|
|
select id from t1 where id in (select distinct a.id from t2 a, t2 b, t2 c, t2 d group by a.id, b.id, c.id, d.id having a.id between 10 and 20);
|
|
select ((@id := kill_id) - kill_id) from t3;
|
|
((@id := kill_id) - kill_id)
|
|
0
|
|
kill @id;
|
|
Got one of the listed errors
|
|
drop table t1, t2, t3;
|
|
select get_lock("a", 10);
|
|
get_lock("a", 10)
|
|
1
|
|
select get_lock("a", 10);
|
|
get_lock("a", 10)
|
|
NULL
|
|
select 1;
|
|
1
|
|
1
|
|
select RELEASE_LOCK("a");
|
|
RELEASE_LOCK("a")
|
|
1
|
|
create table t1(f1 int);
|
|
create function bug27563() returns int(11)
|
|
deterministic
|
|
begin
|
|
declare continue handler for sqlstate '70100' set @a:= 'killed';
|
|
declare continue handler for sqlexception set @a:= 'exception';
|
|
set @a= get_lock("lock27563", 10);
|
|
return 1;
|
|
end|
|
|
select get_lock("lock27563",10);
|
|
get_lock("lock27563",10)
|
|
1
|
|
insert into t1 values (bug27563());
|
|
ERROR 70100: Query execution was interrupted
|
|
select @a;
|
|
@a
|
|
NULL
|
|
select * from t1;
|
|
f1
|
|
insert into t1 values(0);
|
|
update t1 set f1= bug27563();
|
|
ERROR 70100: Query execution was interrupted
|
|
select @a;
|
|
@a
|
|
NULL
|
|
select * from t1;
|
|
f1
|
|
0
|
|
insert into t1 values(1);
|
|
delete from t1 where bug27563() is null;
|
|
ERROR 70100: Query execution was interrupted
|
|
select @a;
|
|
@a
|
|
NULL
|
|
select * from t1;
|
|
f1
|
|
0
|
|
1
|
|
select * from t1 where f1= bug27563();
|
|
ERROR 70100: Query execution was interrupted
|
|
select @a;
|
|
@a
|
|
NULL
|
|
create procedure proc27563()
|
|
begin
|
|
declare continue handler for sqlstate '70100' set @a:= 'killed';
|
|
declare continue handler for sqlexception set @a:= 'exception';
|
|
select get_lock("lock27563",10);
|
|
select "shouldn't be selected";
|
|
end|
|
|
call proc27563();
|
|
get_lock("lock27563",10)
|
|
NULL
|
|
ERROR 70100: Query execution was interrupted
|
|
select @a;
|
|
@a
|
|
NULL
|
|
create table t2 (f2 int);
|
|
create trigger trg27563 before insert on t1 for each row
|
|
begin
|
|
declare continue handler for sqlstate '70100' set @a:= 'killed';
|
|
declare continue handler for sqlexception set @a:= 'exception';
|
|
set @a:= get_lock("lock27563",10);
|
|
insert into t2 values(1);
|
|
end|
|
|
insert into t1 values(2),(3);
|
|
ERROR 70100: Query execution was interrupted
|
|
select @a;
|
|
@a
|
|
NULL
|
|
select * from t1;
|
|
f1
|
|
0
|
|
1
|
|
select * from t2;
|
|
f2
|
|
select release_lock("lock27563");
|
|
release_lock("lock27563")
|
|
1
|
|
drop table t1, t2;
|
|
drop function bug27563;
|
|
drop procedure proc27563;
|
|
PREPARE stmt FROM 'EXPLAIN SELECT * FROM t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21,t22,t23,t24,t25,t26,t27,t28,t29,t30,t31,t32,t33,t34,t35,t36,t37,t38,t39,t40 WHERE a1=a2 AND a2=a3 AND a3=a4 AND a4=a5 AND a5=a6 AND a6=a7 AND a7=a8 AND a8=a9 AND a9=a10 AND a10=a11 AND a11=a12 AND a12=a13 AND a13=a14 AND a14=a15 AND a15=a16 AND a16=a17 AND a17=a18 AND a18=a19 AND a19=a20 AND a20=a21 AND a21=a22 AND a22=a23 AND a23=a24 AND a24=a25 AND a25=a26 AND a26=a27 AND a27=a28 AND a28=a29 AND a29=a30 AND a30=a31 AND a31=a32 AND a32=a33 AND a33=a34 AND a34=a35 AND a35=a36 AND a36=a37 AND a37=a38 AND a38=a39 AND a39=a40 ';
|
|
EXECUTE stmt;
|
|
#
|
|
# Bug#19723: kill of active connection yields different error code
|
|
# depending on platform.
|
|
#
|
|
|
|
# Connection: con2.
|
|
KILL CONNECTION_ID();
|
|
# CR_SERVER_LOST, CR_SERVER_GONE_ERROR, depending on the timing
|
|
# of close of the connection socket
|
|
SELECT 1;
|
|
Got one of the listed errors
|
|
#
|
|
# Additional test for WL#3726 "DDL locking for all metadata objects"
|
|
# Check that DDL and DML statements waiting for metadata locks can
|
|
# be killed. Note that we don't cover all situations here since it
|
|
# can be tricky to write test case for some of them (e.g. REPAIR or
|
|
# ALTER and other statements under LOCK TABLES).
|
|
#
|
|
drop tables if exists t1, t2, t3;
|
|
create table t1 (i int primary key);
|
|
# Test for RENAME TABLE
|
|
# Switching to connection 'blocker'
|
|
lock table t1 read;
|
|
# Switching to connection 'ddl'
|
|
rename table t1 to t2;
|
|
# Switching to connection 'default'
|
|
kill query ID;
|
|
# Switching to connection 'ddl'
|
|
ERROR 70100: Query execution was interrupted
|
|
# Test for DROP TABLE
|
|
drop table t1;
|
|
# Switching to connection 'default'
|
|
kill query ID;
|
|
# Switching to connection 'ddl'
|
|
ERROR 70100: Query execution was interrupted
|
|
# Test for CREATE TRIGGER
|
|
create trigger t1_bi before insert on t1 for each row set @a:=1;
|
|
# Switching to connection 'default'
|
|
kill query ID;
|
|
# Switching to connection 'ddl'
|
|
ERROR 70100: Query execution was interrupted
|
|
#
|
|
# Tests for various kinds of ALTER TABLE
|
|
#
|
|
# Full-blown ALTER which should copy table
|
|
alter table t1 add column j int;
|
|
# Switching to connection 'default'
|
|
kill query ID;
|
|
# Switching to connection 'ddl'
|
|
ERROR 70100: Query execution was interrupted
|
|
# Two kinds of simple ALTER
|
|
alter table t1 rename to t2;
|
|
# Switching to connection 'default'
|
|
kill query ID;
|
|
# Switching to connection 'ddl'
|
|
ERROR 70100: Query execution was interrupted
|
|
alter table t1 disable keys;
|
|
# Switching to connection 'default'
|
|
kill query ID;
|
|
# Switching to connection 'ddl'
|
|
ERROR 70100: Query execution was interrupted
|
|
# Fast ALTER
|
|
alter table t1 alter column i set default 100;
|
|
# Switching to connection 'default'
|
|
kill query ID;
|
|
# Switching to connection 'ddl'
|
|
ERROR 70100: Query execution was interrupted
|
|
# Special case which is triggered only for MERGE tables.
|
|
# Switching to connection 'blocker'
|
|
unlock tables;
|
|
create table t2 (i int primary key) engine=merge union=(t1);
|
|
lock tables t2 read;
|
|
# Switching to connection 'ddl'
|
|
alter table t2 alter column i set default 100;
|
|
# Switching to connection 'default'
|
|
kill query ID;
|
|
# Switching to connection 'ddl'
|
|
ERROR 70100: Query execution was interrupted
|
|
# Test for DML waiting for meta-data lock
|
|
# Switching to connection 'blocker'
|
|
unlock tables;
|
|
drop table t2;
|
|
create table t2 (k int);
|
|
lock tables t1 read;
|
|
# Switching to connection 'ddl'
|
|
rename tables t1 to t3, t2 to t1;
|
|
# Switching to connection 'dml'
|
|
insert into t2 values (1);
|
|
# Switching to connection 'default'
|
|
kill query ID2;
|
|
# Switching to connection 'dml'
|
|
ERROR 70100: Query execution was interrupted
|
|
# Switching to connection 'blocker'
|
|
unlock tables;
|
|
# Switching to connection 'ddl'
|
|
# Test for DML waiting for tables to be flushed
|
|
# Switching to connection 'blocker'
|
|
lock tables t1 read;
|
|
# Switching to connection 'ddl'
|
|
# Let us mark locked table t1 as old
|
|
flush tables;
|
|
# Switching to connection 'dml'
|
|
select * from t1;
|
|
# Switching to connection 'default'
|
|
kill query ID2;
|
|
# Switching to connection 'dml'
|
|
ERROR 70100: Query execution was interrupted
|
|
# Switching to connection 'blocker'
|
|
unlock tables;
|
|
# Switching to connection 'ddl'
|
|
# Cleanup.
|
|
# Switching to connection 'default'
|
|
drop table t3;
|
|
drop table t1;
|
|
set @@global.concurrent_insert= @old_concurrent_insert;
|