mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
Initial import of WL#3726 "DDL locking for all metadata objects".
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.
This commit is contained in:
Konstantin Osipov
@ -138,4 +138,107 @@ KILL CONNECTION_ID();
|
||||
# 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;
|
||||
|
||||
Reference in New Issue
Block a user