Skip to content

M
mariadb
Commit 7ee2962f authored by Sneha Modi's avatar Sneha Modi
Browse files
Options

Bug#11748731:SOME 'BIG' TESTS FAILING ON 6.0 

A patch for alter_table-big.test has been committed earlier.
This is a patch for create-big.test:
The test used to time-out after 900 seconds. 
It relied on debug sleeps that are no longer present in the 
code. Since the sleeps are long gone, fixing the problem didn't 
involve just updating the result file or using macro 
"show_binlog_events2.inc" instead of "show binlog events" 
statement. The test needed to be rewritten using debug sync 
points, and result then needed to be updated.
So, the sleeps have been replaced by debug_sync points and the test execution time has 
been reduced significantly.
parent f7513f39
Show whitespace changes
Inline Side-by-side
Showing with 415 additions and 296 deletions
mysql-test/r/create-big.result
View file @ 7ee2962f
drop table if exists t1,t2,t3,t4,t5; drop table if exists t1,t2,t3,t4,t5;
set session debug="+d,sleep_create_select_before_create"; set debug_sync='RESET';
set debug_sync='create_table_select_before_create SIGNAL parked WAIT_FOR go';
create table t1 select 1 as i;; create table t1 select 1 as i;;
create table t1 (j char(5)); set debug_sync='now WAIT_FOR parked';
create table t1 (j char(5));;
set debug_sync='now SIGNAL go';
ERROR 42S01: Table 't1' already exists ERROR 42S01: Table 't1' already exists
show create table t1; show create table t1;
Table Create Table Table Create Table
...@@ -9,8 +12,11 @@ t1 CREATE TABLE `t1` ( ...@@ -9,8 +12,11 @@ t1 CREATE TABLE `t1` (
`i` int(1) NOT NULL DEFAULT '0' `i` int(1) NOT NULL DEFAULT '0'
) ENGINE=MyISAM DEFAULT CHARSET=latin1 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
drop table t1; drop table t1;
set debug_sync='create_table_select_before_create SIGNAL parked WAIT_FOR go';
create table t1 select 1 as i;; create table t1 select 1 as i;;
create table t1 select "Test" as j; set debug_sync='now WAIT_FOR parked';
create table t1 select 'Test' as j;;
set debug_sync='now SIGNAL go';
ERROR 42S01: Table 't1' already exists ERROR 42S01: Table 't1' already exists
show create table t1; show create table t1;
Table Create Table Table Create Table
...@@ -19,8 +25,11 @@ t1 CREATE TABLE `t1` ( ...@@ -19,8 +25,11 @@ t1 CREATE TABLE `t1` (
) ENGINE=MyISAM DEFAULT CHARSET=latin1 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
drop table t1; drop table t1;
create table t3 (j char(5)); create table t3 (j char(5));
set debug_sync='create_table_select_before_create SIGNAL parked WAIT_FOR go';
create table t1 select 1 as i;; create table t1 select 1 as i;;
create table t1 like t3; set debug_sync='now WAIT_FOR parked';
create table t1 like t3;;
set debug_sync='now SIGNAL go';
ERROR 42S01: Table 't1' already exists ERROR 42S01: Table 't1' already exists
show create table t1; show create table t1;
Table Create Table Table Create Table
...@@ -28,8 +37,11 @@ t1 CREATE TABLE `t1` ( ...@@ -28,8 +37,11 @@ t1 CREATE TABLE `t1` (
`i` int(1) NOT NULL DEFAULT '0' `i` int(1) NOT NULL DEFAULT '0'
) ENGINE=MyISAM DEFAULT CHARSET=latin1 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
drop table t1; drop table t1;
set debug_sync='create_table_select_before_create SIGNAL parked WAIT_FOR go';
create table t1 select 1 as i;; create table t1 select 1 as i;;
rename table t3 to t1; set debug_sync='now WAIT_FOR parked';
rename table t3 to t1;;
set debug_sync='now SIGNAL go';
ERROR 42S01: Table 't1' already exists ERROR 42S01: Table 't1' already exists
show create table t1; show create table t1;
Table Create Table Table Create Table
...@@ -37,82 +49,117 @@ t1 CREATE TABLE `t1` ( ...@@ -37,82 +49,117 @@ t1 CREATE TABLE `t1` (
`i` int(1) NOT NULL DEFAULT '0' `i` int(1) NOT NULL DEFAULT '0'
) ENGINE=MyISAM DEFAULT CHARSET=latin1 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
drop table t1; drop table t1;
set debug_sync='create_table_select_before_create SIGNAL parked WAIT_FOR go';
create table t1 select 1 as i;; create table t1 select 1 as i;;
set debug_sync='now WAIT_FOR parked';
alter table t3 rename to t1; alter table t3 rename to t1;
ERROR 42S01: Table 't1' already exists ERROR 42S01: Table 't1' already exists
set debug_sync='now SIGNAL go';
show create table t1; show create table t1;
Table Create Table Table Create Table
t1 CREATE TABLE `t1` ( t1 CREATE TABLE `t1` (
`i` int(1) NOT NULL DEFAULT '0' `i` int(1) NOT NULL DEFAULT '0'
) ENGINE=MyISAM DEFAULT CHARSET=latin1 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
drop table t1; drop table t1;
set debug_sync='create_table_select_before_create SIGNAL parked WAIT_FOR go';
create table t1 select 1 as i;; create table t1 select 1 as i;;
set debug_sync='now WAIT_FOR parked';
alter table t3 rename to t1, add k int; alter table t3 rename to t1, add k int;
ERROR 42S01: Table 't1' already exists ERROR 42S01: Table 't1' already exists
set debug_sync='now SIGNAL go';
show create table t1; show create table t1;
Table Create Table Table Create Table
t1 CREATE TABLE `t1` ( t1 CREATE TABLE `t1` (
`i` int(1) NOT NULL DEFAULT '0' `i` int(1) NOT NULL DEFAULT '0'
) ENGINE=MyISAM DEFAULT CHARSET=latin1 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
drop table t1, t3; drop table t1,t3;
set session debug="-d,sleep_create_select_before_create:+d,sleep_create_select_before_open"; set debug_sync='create_table_select_before_open SIGNAL parked WAIT_FOR go';
create table t1 select 1 as i;; set debug_sync='create_table_select_before_open SIGNAL parked WAIT_FOR go';
drop table t1; create table t1 select 1 as i;;
create table t1 select 1 as i;; set debug_sync='now WAIT_FOR parked';
rename table t1 to t2; drop table t1;;
set debug_sync='now SIGNAL go';
set debug_sync='create_table_select_before_create SIGNAL parked WAIT_FOR go';
create table t1 select 1 as i;;
set debug_sync='now WAIT_FOR parked';
rename table t1 to t2;;
set debug_sync='now SIGNAL go';
drop table t2; drop table t2;
set debug_sync='create_table_select_before_create SIGNAL parked WAIT_FOR go';
create table t1 select 1 as i;; create table t1 select 1 as i;;
select * from t1; set debug_sync='now WAIT_FOR parked';
select * from t1;;
set debug_sync='now SIGNAL go';
i i
1 1
drop table t1; drop table t1;
set debug_sync='create_table_select_before_create SIGNAL parked WAIT_FOR go';
create table t1 select 1 as i;; create table t1 select 1 as i;;
insert into t1 values (2); set debug_sync='now WAIT_FOR parked';
insert into t1 values (2);;
set debug_sync='now SIGNAL go';
select * from t1; select * from t1;
i i
1 1
2 2
drop table t1; drop table t1;
set @a:=0; set @a:=0;
set debug_sync='create_table_select_before_create SIGNAL parked WAIT_FOR go';
create table t1 select 1 as i;; create table t1 select 1 as i;;
create trigger t1_bi before insert on t1 for each row set @a:=1; set debug_sync='now WAIT_FOR parked';
create trigger t1_bi before insert on t1 for each row set @a:=1;;
set debug_sync='now SIGNAL go';
select @a; select @a;
@a @a
0 0
drop table t1; drop table t1;
set session debug="-d,sleep_create_select_before_open:+d,sleep_create_select_before_lock"; set debug_sync='create_table_select_before_lock SIGNAL parked WAIT_FOR go';
create table t1 select 1 as i;; create table t1 select 1 as i;;
drop table t1; set debug_sync='now WAIT_FOR parked';
drop table t1;;
set debug_sync='now SIGNAL go';
set debug_sync='create_table_select_before_lock SIGNAL parked WAIT_FOR go';
create table t1 select 1 as i;; create table t1 select 1 as i;;
rename table t1 to t2; set debug_sync='now WAIT_FOR parked';
rename table t1 to t2;;
set debug_sync='now SIGNAL go';
drop table t2; drop table t2;
set debug_sync='create_table_select_before_lock SIGNAL parked WAIT_FOR go';
create table t1 select 1 as i;; create table t1 select 1 as i;;
select * from t1; set debug_sync='now WAIT_FOR parked';
select * from t1;;
set debug_sync='now SIGNAL go';
i i
1 1
drop table t1; drop table t1;
set debug_sync='create_table_select_before_lock SIGNAL parked WAIT_FOR go';
create table t1 select 1 as i;; create table t1 select 1 as i;;
insert into t1 values (2); set debug_sync='now WAIT_FOR parked';
insert into t1 values (2);;
set debug_sync='now SIGNAL go';
select * from t1; select * from t1;
i i
1 1
2 2
drop table t1; drop table t1;
set @a:=0; set @a:=0;
set debug_sync='create_table_select_before_lock SIGNAL parked WAIT_FOR go';
create table t1 select 1 as i;; create table t1 select 1 as i;;
create trigger t1_bi before insert on t1 for each row set @a:=1; set debug_sync='now WAIT_FOR parked';
create trigger t1_bi before insert on t1 for each row set @a:=1;;
set debug_sync='now SIGNAL go';
select @a; select @a;
@a @a
0 0
drop table t1; drop table t1;
set session debug="-d,sleep_create_select_before_lock:+d,sleep_create_select_before_check_if_exists"; set debug_sync='create_table_select_before_check_if_exists SIGNAL parked WAIT_FOR go';
create table t1 (i int);
create table if not exists t1 select 1 as i;; create table if not exists t1 select 1 as i;;
drop table t1; set debug_sync='now WAIT_FOR parked';
Warnings: drop table t1;;
Note 1050 Table 't1' already exists set debug_sync='now SIGNAL go';
create table t1 (i int); create table t1 (i int);
set @a:=0; set @a:=0;
set debug_sync='create_table_select_before_check_if_exists SIGNAL parked WAIT_FOR go';
create table if not exists t1 select 1 as i;; create table if not exists t1 select 1 as i;;
create trigger t1_bi before insert on t1 for each row set @a:=1; create trigger t1_bi before insert on t1 for each row set @a:=1;
Warnings: Warnings:
...@@ -122,53 +169,17 @@ select @a; ...@@ -122,53 +169,17 @@ select @a;
0 0
select * from t1; select * from t1;
i i
1
drop table t1; drop table t1;
set session debug="-d,sleep_create_select_before_check_if_exists";
create table t2 (a int);
create table t4 (b int);
lock table t4 write;
select 1;
1
1
create table t3 as select * from t4;;
create table t1 select * from t2, t3;;
unlock tables;
select * from t1;
a b
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL,
`b` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
drop table t1, t3;
lock table t4 read;
select 1;
1
1
rename table t4 to t3;;
create table if not exists t1 select 1 as i from t2, t3;;
create table t5 (j int);
rename table t5 to t1;
unlock tables;
Warnings:
Note 1050 Table 't1' already exists
select * from t1;
j
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
`j` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
drop table t1, t2, t3;
drop table if exists t1,t2; drop table if exists t1,t2;
set debug_sync='RESET';
create table t1 (i int); create table t1 (i int);
set session debug="+d,sleep_create_like_before_check_if_exists"; set debug_sync='create_table_like_after_open SIGNAL parked WAIT_FOR go';
reset master; reset master;
create table t2 like t1;; create table t2 like t1;;
set debug_sync='now WAIT_FOR parked';
insert into t1 values (1); insert into t1 values (1);
drop table t1; drop table t1;;
set debug_sync='now SIGNAL go';
show create table t2; show create table t2;
Table Create Table Table Create Table
t2 CREATE TABLE `t2` ( t2 CREATE TABLE `t2` (
...@@ -177,71 +188,41 @@ t2 CREATE TABLE `t2` ( ...@@ -177,71 +188,41 @@ t2 CREATE TABLE `t2` (
drop table t2; drop table t2;
show binlog events from <binlog_start>; show binlog events from <binlog_start>;
Log_name Pos Event_type Server_id End_log_pos Info Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Query # # BEGIN
master-bin.000001 # Query # # use `test`; insert into t1 values (1) master-bin.000001 # Query # # use `test`; insert into t1 values (1)
master-bin.000001 # Query # # COMMIT
master-bin.000001 # Query # # use `test`; create table t2 like t1 master-bin.000001 # Query # # use `test`; create table t2 like t1
master-bin.000001 # Query # # use `test`; drop table t1 master-bin.000001 # Query # # use `test`; DROP TABLE `t1` /* generated by server */
master-bin.000001 # Query # # use `test`; drop table t2 master-bin.000001 # Query # # use `test`; DROP TABLE `t2` /* generated by server */
create table t1 (i int); create table t1 (i int);
set session debug="-d,sleep_create_like_before_check_if_exists:+d,sleep_create_like_before_copy"; set debug_sync='create_table_like_before_binlog SIGNAL parked WAIT_FOR go';
create table t2 like t1;;
create table if not exists t2 (j int);
Warnings:
Note 1050 Table 't2' already exists
show create table t2;
Table Create Table
t2 CREATE TABLE `t2` (
`i` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
drop table t2;
reset master;
create table t2 like t1;;
drop table t1;
drop table t2;
show binlog events from <binlog_start>;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Query # # use `test`; create table t2 like t1
master-bin.000001 # Query # # use `test`; drop table t1
master-bin.000001 # Query # # use `test`; drop table t2
create table t1 (i int);
set session debug="-d,sleep_create_like_before_copy:+d,sleep_create_like_before_ha_create";
reset master; reset master;
create table t2 like t1;; create table t2 like t1;;
insert into t2 values (1); set debug_sync='now WAIT_FOR parked';
insert into t2 values (1);;
set debug_sync='now SIGNAL go';
drop table t2; drop table t2;
set debug_sync='create_table_like_before_binlog SIGNAL parked WAIT_FOR go';
create table t2 like t1;; create table t2 like t1;;
drop table t2; set debug_sync='now WAIT_FOR parked';
drop table t2;;
set debug_sync='now SIGNAL go';
set debug_sync='create_table_like_before_binlog SIGNAL parked WAIT_FOR go';
create table t2 like t1;; create table t2 like t1;;
drop table t1; set debug_sync='now WAIT_FOR parked';
drop table t2; drop table t1;;
show binlog events from <binlog_start>; set debug_sync='now SIGNAL go';
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Query # # use `test`; create table t2 like t1
master-bin.000001 # Query # # use `test`; insert into t2 values (1)
master-bin.000001 # Query # # use `test`; drop table t2
master-bin.000001 # Query # # use `test`; create table t2 like t1
master-bin.000001 # Query # # use `test`; drop table t2
master-bin.000001 # Query # # use `test`; create table t2 like t1
master-bin.000001 # Query # # use `test`; drop table t1
master-bin.000001 # Query # # use `test`; drop table t2
create table t1 (i int);
set session debug="-d,sleep_create_like_before_ha_create:+d,sleep_create_like_before_binlogging";
reset master;
create table t2 like t1;;
insert into t2 values (1);
drop table t2;
create table t2 like t1;;
drop table t2;
create table t2 like t1;;
drop table t1;
drop table t2; drop table t2;
set debug_sync='RESET';
show binlog events from <binlog_start>; show binlog events from <binlog_start>;
Log_name Pos Event_type Server_id End_log_pos Info Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Query # # use `test`; create table t2 like t1 master-bin.000001 # Query # # use `test`; create table t2 like t1
master-bin.000001 # Query # # BEGIN
master-bin.000001 # Query # # use `test`; insert into t2 values (1) master-bin.000001 # Query # # use `test`; insert into t2 values (1)
master-bin.000001 # Query # # use `test`; drop table t2 master-bin.000001 # Query # # COMMIT
master-bin.000001 # Query # # use `test`; DROP TABLE `t2` /* generated by server */
master-bin.000001 # Query # # use `test`; create table t2 like t1 master-bin.000001 # Query # # use `test`; create table t2 like t1
master-bin.000001 # Query # # use `test`; drop table t2 master-bin.000001 # Query # # use `test`; DROP TABLE `t2` /* generated by server */
master-bin.000001 # Query # # use `test`; create table t2 like t1 master-bin.000001 # Query # # use `test`; create table t2 like t1
master-bin.000001 # Query # # use `test`; drop table t1 master-bin.000001 # Query # # use `test`; DROP TABLE `t1` /* generated by server */
master-bin.000001 # Query # # use `test`; drop table t2 master-bin.000001 # Query # # use `test`; DROP TABLE `t2` /* generated by server */
set session debug="-d,sleep_create_like_before_binlogging";
mysql-test/t/create-big.test
View file @ 7ee2962f
...@@ -7,11 +7,13 @@ ...@@ -7,11 +7,13 @@
# #
# This test takes rather long time so let us run it only in --big-test mode # This test takes rather long time so let us run it only in --big-test mode
--source include/big_test.inc --source include/big_test.inc
# We are using some debug-only features in this test # We need the Debug Sync Facility.
--source include/have_debug.inc --source include/have_debug_sync.inc
# Some of tests below also use binlog to check that statements are # Some of tests below also use binlog to check that statements are
# executed and logged in correct order # executed and logged in correct order
--source include/have_binlog_format_mixed_or_statement.inc --source include/have_binlog_format_mixed_or_statement.inc
# Save the initial number of concurrent sessions.
--source include/count_sessions.inc
# Create auxilliary connections # Create auxilliary connections
connect (addconroot1, localhost, root,,); connect (addconroot1, localhost, root,,);
...@@ -22,7 +24,7 @@ connection default; ...@@ -22,7 +24,7 @@ connection default;
--disable_warnings --disable_warnings
drop table if exists t1,t2,t3,t4,t5; drop table if exists t1,t2,t3,t4,t5;
--enable_warnings --enable_warnings
set debug_sync='RESET';
# #
# Tests for concurrency problems in CREATE TABLE ... SELECT # Tests for concurrency problems in CREATE TABLE ... SELECT
...@@ -34,244 +36,378 @@ drop table if exists t1,t2,t3,t4,t5; ...@@ -34,244 +36,378 @@ drop table if exists t1,t2,t3,t4,t5;
# What happens in situation when other statement messes with # What happens in situation when other statement messes with
# table to be created before it is created ? # table to be created before it is created ?
# Concurrent CREATE TABLE # Concurrent CREATE TABLE
set session debug="+d,sleep_create_select_before_create"; set debug_sync='create_table_select_before_create SIGNAL parked WAIT_FOR go';
--send create table t1 select 1 as i; --send create table t1 select 1 as i;
connection addconroot1; connection addconroot1;
--sleep 2 set debug_sync='now WAIT_FOR parked';
--error ER_TABLE_EXISTS_ERROR --send create table t1 (j char(5));
create table t1 (j char(5)); connection addconroot2;
let $wait_condition=
select count(*) = 1 from information_schema.processlist
where state = "Waiting for table metadata lock" and
info = "create table t1 (j char(5))";
--source include/wait_condition.inc
set debug_sync='now SIGNAL go';
connection default; connection default;
--reap --reap
connection addconroot1;
--error ER_TABLE_EXISTS_ERROR
--reap
connection default;
show create table t1; show create table t1;
drop table t1; drop table t1;
# Concurrent CREATE TABLE ... SELECT # Concurrent CREATE TABLE ... SELECT
set debug_sync='create_table_select_before_create SIGNAL parked WAIT_FOR go';
--send create table t1 select 1 as i; --send create table t1 select 1 as i;
connection addconroot1; connection addconroot1;
--sleep 2 set debug_sync='now WAIT_FOR parked';
--error ER_TABLE_EXISTS_ERROR --send create table t1 select 'Test' as j;
create table t1 select "Test" as j; connection addconroot2;
# Wait until the above CREATE TABLE t1 is blocked due to CREATE
let $wait_condition=
select count(*) = 1 from information_schema.processlist
where state = "Waiting for table metadata lock" and
info = "create table t1 select 'Test' as j";
--source include/wait_condition.inc
set debug_sync='now SIGNAL go';
connection default; connection default;
--reap --reap
connection addconroot1;
--error ER_TABLE_EXISTS_ERROR
--reap
connection default;
show create table t1; show create table t1;
drop table t1; drop table t1;
# Concurrent CREATE TABLE LIKE # Concurrent CREATE TABLE LIKE
create table t3 (j char(5)); create table t3 (j char(5));
set debug_sync='create_table_select_before_create SIGNAL parked WAIT_FOR go';
--send create table t1 select 1 as i; --send create table t1 select 1 as i;
connection addconroot1; connection addconroot1;
--sleep 2 set debug_sync='now WAIT_FOR parked';
--error ER_TABLE_EXISTS_ERROR --send create table t1 like t3;
create table t1 like t3; connection addconroot2;
# Wait until the above CREATE TABLE t1 is blocked due to CREATE
let $wait_condition=
select count(*) = 1 from information_schema.processlist
where state = "Waiting for table metadata lock" and
info = "create table t1 like t3";
--source include/wait_condition.inc
set debug_sync='now SIGNAL go';
connection default; connection default;
--reap --reap
connection addconroot1;
--error ER_TABLE_EXISTS_ERROR
--reap
connection default;
show create table t1; show create table t1;
drop table t1; drop table t1;
# Concurrent RENAME TABLE # Concurrent RENAME TABLE
set debug_sync='create_table_select_before_create SIGNAL parked WAIT_FOR go';
--send create table t1 select 1 as i; --send create table t1 select 1 as i;
connection addconroot1; connection addconroot1;
--sleep 2 set debug_sync='now WAIT_FOR parked';
--error ER_TABLE_EXISTS_ERROR --send rename table t3 to t1;
rename table t3 to t1; connection addconroot2;
# Wait until the above RENAME TABLE is blocked due to CREATE
let $wait_condition=
select count(*) = 1 from information_schema.processlist
where state = "Waiting for table metadata lock" and
info = "rename table t3 to t1";
--source include/wait_condition.inc
set debug_sync='now SIGNAL go';
connection default; connection default;
--reap --reap
connection addconroot1;
--error ER_TABLE_EXISTS_ERROR
--reap
connection default;
show create table t1; show create table t1;
drop table t1; drop table t1;
# Concurrent ALTER TABLE RENAME # Concurrent ALTER TABLE RENAME
set debug_sync='create_table_select_before_create SIGNAL parked WAIT_FOR go';
--send create table t1 select 1 as i; --send create table t1 select 1 as i;
connection addconroot1; connection addconroot1;
--sleep 2 set debug_sync='now WAIT_FOR parked';
--error ER_TABLE_EXISTS_ERROR --error ER_TABLE_EXISTS_ERROR
alter table t3 rename to t1; alter table t3 rename to t1;
set debug_sync='now SIGNAL go';
connection default; connection default;
--reap --reap
connection default;
show create table t1; show create table t1;
drop table t1; drop table t1;
# Concurrent ALTER TABLE RENAME which also adds column # Concurrent ALTER TABLE RENAME which also adds column
set debug_sync='create_table_select_before_create SIGNAL parked WAIT_FOR go';
--send create table t1 select 1 as i; --send create table t1 select 1 as i;
connection addconroot1; connection addconroot1;
--sleep 2 set debug_sync='now WAIT_FOR parked';
--error ER_TABLE_EXISTS_ERROR --error ER_TABLE_EXISTS_ERROR
alter table t3 rename to t1, add k int; alter table t3 rename to t1, add k int;
set debug_sync='now SIGNAL go';
connection default; connection default;
--reap --reap
show create table t1; show create table t1;
drop table t1, t3; drop table t1,t3;
# What happens if other statement sneaks in after the table # What happens if other statement sneaks in after the table
# creation but before its opening ? # creation but before its opening ?
set session debug="-d,sleep_create_select_before_create:+d,sleep_create_select_before_open"; set debug_sync='create_table_select_before_open SIGNAL parked WAIT_FOR go';
connection default;
# Concurrent DROP TABLE # Concurrent DROP TABLE
set debug_sync='create_table_select_before_open SIGNAL parked WAIT_FOR go';
--send create table t1 select 1 as i; --send create table t1 select 1 as i;
connection addconroot1; connection addconroot1;
--sleep 2 set debug_sync='now WAIT_FOR parked';
drop table t1; --send drop table t1;
connection addconroot2;
# Wait until the above DROP TABLE is blocked due to CREATE
let $wait_condition=
select count(*) = 1 from information_schema.processlist
where state = "Waiting for table metadata lock" and
info = "drop table t1";
--source include/wait_condition.inc
set debug_sync='now SIGNAL go';
connection default; connection default;
--reap --reap
connection addconroot1;
--reap
connection default;
# Concurrent RENAME TABLE # Concurrent RENAME TABLE
set debug_sync='create_table_select_before_create SIGNAL parked WAIT_FOR go';
--send create table t1 select 1 as i; --send create table t1 select 1 as i;
connection addconroot1; connection addconroot1;
--sleep 2 set debug_sync='now WAIT_FOR parked';
rename table t1 to t2; --send rename table t1 to t2;
connection addconroot2;
# Wait until the above RENAME TABLE is blocked due to CREATE
let $wait_condition=
select count(*) = 1 from information_schema.processlist
where state = "Waiting for table metadata lock" and
info = "rename table t1 to t2";
--source include/wait_condition.inc
set debug_sync='now SIGNAL go';
connection default; connection default;
--reap --reap
connection addconroot1;
--reap
connection default;
drop table t2; drop table t2;
# Concurrent SELECT # Concurrent SELECT
set debug_sync='create_table_select_before_create SIGNAL parked WAIT_FOR go';
--send create table t1 select 1 as i; --send create table t1 select 1 as i;
connection addconroot1; connection addconroot1;
--sleep 2 set debug_sync='now WAIT_FOR parked';
select * from t1; --send select * from t1;
connection addconroot2;
# Wait until the above SELECT is blocked due to CREATE
let $wait_condition=
select count(*) = 1 from information_schema.processlist
where state = "Waiting for table metadata lock" and
info = "select * from t1";
--source include/wait_condition.inc
set debug_sync='now SIGNAL go';
connection default; connection default;
--reap --reap
connection addconroot1;
--reap
connection default;
drop table t1; drop table t1;
# Concurrent INSERT # Concurrent INSERT
set debug_sync='create_table_select_before_create SIGNAL parked WAIT_FOR go';
--send create table t1 select 1 as i; --send create table t1 select 1 as i;
connection addconroot1; connection addconroot1;
--sleep 2 set debug_sync='now WAIT_FOR parked';
insert into t1 values (2); --send insert into t1 values (2);
connection addconroot2;
# Wait until the above INSERT is blocked due to CREATE
let $wait_condition=
select count(*) = 1 from information_schema.processlist
where state = "Waiting for table metadata lock" and
info = "insert into t1 values (2)";
--source include/wait_condition.inc
set debug_sync='now SIGNAL go';
connection default; connection default;
--reap --reap
connection addconroot1;
--reap
connection default;
select * from t1; select * from t1;
drop table t1; drop table t1;
# Concurrent CREATE TRIGGER # Concurrent CREATE TRIGGER
set @a:=0; set @a:=0;
set debug_sync='create_table_select_before_create SIGNAL parked WAIT_FOR go';
--send create table t1 select 1 as i; --send create table t1 select 1 as i;
connection addconroot1; connection addconroot1;
--sleep 2 set debug_sync='now WAIT_FOR parked';
create trigger t1_bi before insert on t1 for each row set @a:=1; --send create trigger t1_bi before insert on t1 for each row set @a:=1;
connection addconroot2;
# Wait until the above CREATE TRIGGER is blocked due to CREATE TABLE
let $wait_condition=
select count(*) = 1 from information_schema.processlist
where state = "Waiting for table metadata lock" and
info = "create trigger t1_bi before insert on t1 for each row set @a:=1";
--source include/wait_condition.inc
set debug_sync='now SIGNAL go';
connection default; connection default;
--reap --reap
connection addconroot1;
--reap
connection default;
select @a; select @a;
drop table t1; drop table t1;
# Okay, now the same tests for the potential gap between open and lock # Okay, now the same tests for the potential gap between open and lock
set session debug="-d,sleep_create_select_before_open:+d,sleep_create_select_before_lock"; set debug_sync='create_table_select_before_lock SIGNAL parked WAIT_FOR go';
# Concurrent DROP TABLE # Concurrent DROP TABLE
--send create table t1 select 1 as i; --send create table t1 select 1 as i;
connection addconroot1; connection addconroot1;
--sleep 2 set debug_sync='now WAIT_FOR parked';
drop table t1; --send drop table t1;
connection addconroot2;
# Wait until the above DROP TABLE is blocked due to CREATE TABLE
let $wait_condition=
select count(*) = 1 from information_schema.processlist
where state = "Waiting for table metadata lock" and
info = "drop table t1";
--source include/wait_condition.inc
set debug_sync='now SIGNAL go';
connection default; connection default;
--reap --reap
connection addconroot1;
--reap
connection default;
# Concurrent RENAME TABLE # Concurrent RENAME TABLE
set debug_sync='create_table_select_before_lock SIGNAL parked WAIT_FOR go';
--send create table t1 select 1 as i; --send create table t1 select 1 as i;
connection addconroot1; connection addconroot1;
--sleep 2 set debug_sync='now WAIT_FOR parked';
rename table t1 to t2; --send rename table t1 to t2;
connection addconroot2;
# Wait until the above RENAME TABLE is blocked due to CREATE TABLE
let $wait_condition=
select count(*) = 1 from information_schema.processlist
where state = "Waiting for table metadata lock" and
info = "rename table t1 to t2";
--source include/wait_condition.inc
set debug_sync='now SIGNAL go';
connection default; connection default;
--reap --reap
connection addconroot1;
--reap
connection default;
drop table t2; drop table t2;
# Concurrent SELECT # Concurrent SELECT
set debug_sync='create_table_select_before_lock SIGNAL parked WAIT_FOR go';
--send create table t1 select 1 as i; --send create table t1 select 1 as i;
connection addconroot1; connection addconroot1;
--sleep 2 set debug_sync='now WAIT_FOR parked';
select * from t1; --send select * from t1;
connection addconroot2;
# Wait until the above SELECT is blocked due to CREATE TABLE
let $wait_condition=
select count(*) = 1 from information_schema.processlist
where state = "Waiting for table metadata lock" and
info = "select * from t1";
--source include/wait_condition.inc
set debug_sync='now SIGNAL go';
connection default; connection default;
--reap --reap
connection addconroot1;
--reap
connection default;
drop table t1; drop table t1;
# Concurrent INSERT # Concurrent INSERT
set debug_sync='create_table_select_before_lock SIGNAL parked WAIT_FOR go';
--send create table t1 select 1 as i; --send create table t1 select 1 as i;
connection addconroot1; connection addconroot1;
--sleep 2 set debug_sync='now WAIT_FOR parked';
insert into t1 values (2); --send insert into t1 values (2);
connection addconroot2;
# Wait until the above INSERT INTO t1 is blocked due to CREATE TABLE
let $wait_condition=
select count(*) = 1 from information_schema.processlist
where state = "Waiting for table metadata lock" and
info = "insert into t1 values (2)";
--source include/wait_condition.inc
set debug_sync='now SIGNAL go';
connection default; connection default;
--reap --reap
connection addconroot1;
--reap
connection default;
select * from t1; select * from t1;
drop table t1; drop table t1;
# Concurrent CREATE TRIGGER # Concurrent CREATE TRIGGER
set @a:=0; set @a:=0;
set debug_sync='create_table_select_before_lock SIGNAL parked WAIT_FOR go';
--send create table t1 select 1 as i; --send create table t1 select 1 as i;
connection addconroot1; connection addconroot1;
--sleep 2 set debug_sync='now WAIT_FOR parked';
create trigger t1_bi before insert on t1 for each row set @a:=1; --send create trigger t1_bi before insert on t1 for each row set @a:=1;
connection addconroot2;
# Wait until the above CREATE TRIGGER is blocked due to CREATE TABLE
let $wait_condition=
select count(*) = 1 from information_schema.processlist
where state = "Waiting for table metadata lock" and
info = "create trigger t1_bi before insert on t1 for each row set @a:=1";
--source include/wait_condition.inc
set debug_sync='now SIGNAL go';
connection default; connection default;
--reap --reap
connection addconroot1;
--reap
connection default;
select @a; select @a;
drop table t1; drop table t1;
# Some tests for case with existing table
set session debug="-d,sleep_create_select_before_lock:+d,sleep_create_select_before_check_if_exists";
create table t1 (i int);
# Concurrent DROP TABLE # Concurrent DROP TABLE
set debug_sync='create_table_select_before_check_if_exists SIGNAL parked WAIT_FOR go';
--send create table if not exists t1 select 1 as i; --send create table if not exists t1 select 1 as i;
connection addconroot1; connection addconroot1;
--sleep 2 set debug_sync='now WAIT_FOR parked';
drop table t1; --send drop table t1;
connection addconroot2;
# Wait until the above DROP TABLE is blocked due to CREATE TABLE
let $wait_condition=
select count(*) = 1 from information_schema.processlist
where state = "Waiting for table metadata lock" and
info = "drop table t1";
--source include/wait_condition.inc
set debug_sync='now SIGNAL go';
connection default; connection default;
--reap --reap
connection addconroot1;
--reap
connection default;
# Concurrent CREATE TRIGGER # Concurrent CREATE TRIGGER
create table t1 (i int); create table t1 (i int);
set @a:=0; set @a:=0;
set debug_sync='create_table_select_before_check_if_exists SIGNAL parked WAIT_FOR go';
--send create table if not exists t1 select 1 as i; --send create table if not exists t1 select 1 as i;
connection addconroot1; connection addconroot1;
--sleep 2
create trigger t1_bi before insert on t1 for each row set @a:=1; create trigger t1_bi before insert on t1 for each row set @a:=1;
connection default; connection default;
--reap --reap
connection default;
select @a; select @a;
select * from t1; select * from t1;
drop table t1; drop table t1;
set session debug="-d,sleep_create_select_before_check_if_exists";
# Test for some details of CREATE TABLE ... SELECT implementation.
#
# We check that create placeholder is handled properly if we have
# to reopen tables in open_tables().
# This test heavily relies on current implementation of name-locking/
# table cache so it may stop working if it changes. OTOH it such problem
# will serve as warning that such changes should not be done lightly.
create table t2 (a int);
create table t4 (b int);
connection addconroot2;
lock table t4 write;
select 1;
connection addconroot1;
# Create placeholder/name-lock for t3
--send create table t3 as select * from t4;
--sleep 2
connection default;
# This statement creates placeholder for t1, then opens t2,
# then meets name-lock for t3 and then reopens all tables
--send create table t1 select * from t2, t3;
--sleep 2
connection addconroot2;
unlock tables;
connection addconroot1;
--reap
connection default;
--reap
select * from t1;
show create table t1;
drop table t1, t3;
# Now similar test which proves that we really temporarily
# remove placeholder when we reopen tables.
connection addconroot2;
lock table t4 read;
select 1;
connection addconroot1;
# Create name-lock for t3
--send rename table t4 to t3;
--sleep 2
connection default;
# This statement creates placeholder for t1, then opens t2,
# then meets name-lock for t3 and then reopens all tables
--send create table if not exists t1 select 1 as i from t2, t3;
--sleep 2
connection addconroot3;
# We should be able to take name-lock on table t1 as we should not have
# open placeholder for it at this point (otherwise it is possible to
# come-up with situation which will lead to deadlock, e.g. think of
# concurrent CREATE TABLE t1 SELECT * FROM t2 and RENAME TABLE t2 TO t1)
create table t5 (j int);
# This statement takes name-lock on t1 and therefore proves
# that there is no active open placeholder for it.
rename table t5 to t1;
connection addconroot2;
unlock tables;
connection addconroot1;
--reap
connection default;
--reap
select * from t1;
show create table t1;
drop table t1, t2, t3;
# Tests for possible concurrency issues with CREATE TABLE ... LIKE # Tests for possible concurrency issues with CREATE TABLE ... LIKE
# #
...@@ -286,103 +422,101 @@ drop table t1, t2, t3; ...@@ -286,103 +422,101 @@ drop table t1, t2, t3;
--disable_warnings --disable_warnings
drop table if exists t1,t2; drop table if exists t1,t2;
--enable_warnings --enable_warnings
set debug_sync='RESET';
# What happens if some statements sneak in right after we have # What happens if some statements sneak in right after we have
# opened source table ? # acquired locks and opened source table ?
create table t1 (i int); create table t1 (i int);
set session debug="+d,sleep_create_like_before_check_if_exists"; set debug_sync='create_table_like_after_open SIGNAL parked WAIT_FOR go';
# Reset binlog to have clear start # Reset binlog to have clear start
reset master; reset master;
--send create table t2 like t1; --send create table t2 like t1;
connection addconroot1; connection addconroot1;
--sleep 2 set debug_sync='now WAIT_FOR parked';
# DML on source table should be allowed to run concurrently # DML on source table should be allowed to run concurrently
insert into t1 values (1); insert into t1 values (1);
# And DDL should wait # And DDL should wait
drop table t1; --send drop table t1;
connection addconroot2;
let $wait_condition=
select count(*) = 1 from information_schema.processlist
where state = "Waiting for table metadata lock" and
info = "drop table t1";
--source include/wait_condition.inc
set debug_sync='now SIGNAL go';
connection default; connection default;
--reap --reap
connection addconroot1;
--reap
connection default;
show create table t2; show create table t2;
drop table t2; drop table t2;
# Let us check that statements were executed/binlogged in correct order # Let us check that statements were executed/binlogged in correct order
source include/show_binlog_events.inc; source include/show_binlog_events.inc;
# Now let us check the gap between check for target table # Now check the gap between table creation and binlogging
# existance and copying of .frm file.
create table t1 (i int); create table t1 (i int);
set session debug="-d,sleep_create_like_before_check_if_exists:+d,sleep_create_like_before_copy"; set debug_sync='create_table_like_before_binlog SIGNAL parked WAIT_FOR go';
# It should be impossible to create target table concurrently
--send create table t2 like t1;
connection addconroot1;
--sleep 2
create table if not exists t2 (j int);
connection default;
--reap
show create table t2;
drop table t2;
# And concurrent DDL on the source table should be still disallowed
reset master; reset master;
--send create table t2 like t1; --send create table t2 like t1;
connection addconroot1; connection addconroot1;
--sleep 2 set debug_sync='now WAIT_FOR parked';
drop table t1; --send insert into t2 values (1);
connection addconroot2;
let $wait_condition=
select count(*) = 1 from information_schema.processlist
where state = "Waiting for table metadata lock" and
info = "insert into t2 values (1)";
--source include/wait_condition.inc
set debug_sync='now SIGNAL go';
connection default; connection default;
--reap --reap
drop table t2;
source include/show_binlog_events.inc;
# And now he gap between copying of .frm file and ha_create_table() call.
create table t1 (i int);
set session debug="-d,sleep_create_like_before_copy:+d,sleep_create_like_before_ha_create";
# Both DML and DDL on target table should wait till operation completes
reset master;
--send create table t2 like t1;
connection addconroot1; connection addconroot1;
--sleep 2
insert into t2 values (1);
connection default;
--reap --reap
connection default;
drop table t2; drop table t2;
set debug_sync='create_table_like_before_binlog SIGNAL parked WAIT_FOR go';
--send create table t2 like t1; --send create table t2 like t1;
connection addconroot1; connection addconroot1;
--sleep 2 set debug_sync='now WAIT_FOR parked';
drop table t2; --send drop table t2;
connection addconroot2;
let $wait_condition=
select count(*) = 1 from information_schema.processlist
where state = "Waiting for table metadata lock" and
info = "drop table t2";
--source include/wait_condition.inc
set debug_sync='now SIGNAL go';
connection default; connection default;
--reap --reap
# Concurrent DDL on the source table still waits
--send create table t2 like t1;
connection addconroot1; connection addconroot1;
--sleep 2
drop table t1;
connection default;
--reap --reap
drop table t2;
source include/show_binlog_events.inc;
# Finally we check the gap between ha_create_table() and binlogging
create table t1 (i int);
set session debug="-d,sleep_create_like_before_ha_create:+d,sleep_create_like_before_binlogging";
reset master;
--send create table t2 like t1;
connection addconroot1;
--sleep 2
insert into t2 values (1);
connection default; connection default;
--reap set debug_sync='create_table_like_before_binlog SIGNAL parked WAIT_FOR go';
drop table t2;
--send create table t2 like t1; --send create table t2 like t1;
connection addconroot1; connection addconroot1;
--sleep 2 set debug_sync='now WAIT_FOR parked';
drop table t2; --send drop table t1;
connection addconroot2;
let $wait_condition=
select count(*) = 1 from information_schema.processlist
where state = "Waiting for table metadata lock" and
info = "drop table t1";
--source include/wait_condition.inc
set debug_sync='now SIGNAL go';
connection default; connection default;
--reap --reap
--send create table t2 like t1;
connection addconroot1; connection addconroot1;
--sleep 2
drop table t1;
connection default;
--reap --reap
connection default;
drop table t2; drop table t2;
source include/show_binlog_events.inc; disconnect addconroot1;
disconnect addconroot2;
disconnect addconroot3;
set session debug="-d,sleep_create_like_before_binlogging"; set debug_sync='RESET';
source include/show_binlog_events.inc;
# Check that all connections opened by test cases in this file are really
# gone so execution of other tests won't be affected by their presence.
--source include/wait_until_count_sessions.inc
mysql-test/t/disabled.def
View file @ 7ee2962f
...@@ -12,7 +12,6 @@ ...@@ -12,7 +12,6 @@
lowercase_table3 : Bug#11762269 2010-06-30 alik main.lowercase_table3 on Mac OSX lowercase_table3 : Bug#11762269 2010-06-30 alik main.lowercase_table3 on Mac OSX
read_many_rows_innodb : Bug#11748886 2010-11-15 mattiasj report already exists read_many_rows_innodb : Bug#11748886 2010-11-15 mattiasj report already exists
sum_distinct-big : Bug#11764126 2010-11-15 mattiasj was not tested sum_distinct-big : Bug#11764126 2010-11-15 mattiasj was not tested
create-big : Bug#11748731 2010-11-15 mattiasj was not tested
archive-big : Bug#11817185 2011-03-10 Anitha Disabled since this leads to timeout on Solaris Sparc archive-big : Bug#11817185 2011-03-10 Anitha Disabled since this leads to timeout on Solaris Sparc
log_tables-big : Bug#11756699 2010-11-15 mattiasj report already exists log_tables-big : Bug#11756699 2010-11-15 mattiasj report already exists
mysql_embedded : Bug#12561297 2011-05-14 Anitha Dependent on PB2 changes - eventum#41836 mysql_embedded : Bug#12561297 2011-05-14 Anitha Dependent on PB2 changes - eventum#41836
sql/sql_insert.cc
View file @ 7ee2962f
...@@ -3698,7 +3698,7 @@ static TABLE *create_table_from_items(THD *thd, HA_CREATE_INFO *create_info, ...@@ -3698,7 +3698,7 @@ static TABLE *create_table_from_items(THD *thd, HA_CREATE_INFO *create_info,
alter_info->create_list.push_back(cr_field); alter_info->create_list.push_back(cr_field);
} }
DBUG_EXECUTE_IF("sleep_create_select_before_create", my_sleep(6000000);); DEBUG_SYNC(thd,"create_table_select_before_create");
/* /*
Create and lock table. Create and lock table.
...@@ -3722,7 +3722,7 @@ static TABLE *create_table_from_items(THD *thd, HA_CREATE_INFO *create_info, ...@@ -3722,7 +3722,7 @@ static TABLE *create_table_from_items(THD *thd, HA_CREATE_INFO *create_info,
create_info, alter_info, 0, create_info, alter_info, 0,
select_field_count, NULL)) select_field_count, NULL))
{ {
DBUG_EXECUTE_IF("sleep_create_select_before_open", my_sleep(6000000);); DEBUG_SYNC(thd,"create_table_select_before_open");
if (!(create_info->options & HA_LEX_CREATE_TMP_TABLE)) if (!(create_info->options & HA_LEX_CREATE_TMP_TABLE))
{ {
...@@ -3760,7 +3760,7 @@ static TABLE *create_table_from_items(THD *thd, HA_CREATE_INFO *create_info, ...@@ -3760,7 +3760,7 @@ static TABLE *create_table_from_items(THD *thd, HA_CREATE_INFO *create_info,
DBUG_RETURN(0); DBUG_RETURN(0);
} }
DBUG_EXECUTE_IF("sleep_create_select_before_lock", my_sleep(6000000);); DEBUG_SYNC(thd,"create_table_select_before_lock");
table->reginfo.lock_type=TL_WRITE; table->reginfo.lock_type=TL_WRITE;
hooks->prelock(&table, 1); // Call prelock hooks hooks->prelock(&table, 1); // Call prelock hooks
...@@ -3868,7 +3868,7 @@ select_create::prepare(List<Item> &values, SELECT_LEX_UNIT *u) ...@@ -3868,7 +3868,7 @@ select_create::prepare(List<Item> &values, SELECT_LEX_UNIT *u)
DBUG_ASSERT(create_table->table == NULL); DBUG_ASSERT(create_table->table == NULL);
DBUG_EXECUTE_IF("sleep_create_select_before_check_if_exists", my_sleep(6000000);); DEBUG_SYNC(thd,"create_table_select_before_check_if_exists");
if (!(table= create_table_from_items(thd, create_info, create_table, if (!(table= create_table_from_items(thd, create_info, create_table,
alter_info, &values, alter_info, &values,
......
sql/sql_table.cc
View file @ 7ee2962f
...@@ -4555,6 +4555,8 @@ bool mysql_create_like_table(THD* thd, TABLE_LIST* table, TABLE_LIST* src_table, ...@@ -4555,6 +4555,8 @@ bool mysql_create_like_table(THD* thd, TABLE_LIST* table, TABLE_LIST* src_table,
goto err; goto err;
src_table->table->use_all_columns(); src_table->table->use_all_columns();
DEBUG_SYNC(thd, "create_table_like_after_open");
/* Fill HA_CREATE_INFO and Alter_info with description of source table. */ /* Fill HA_CREATE_INFO and Alter_info with description of source table. */
bzero((char*) &local_create_info, sizeof(local_create_info)); bzero((char*) &local_create_info, sizeof(local_create_info));
local_create_info.db_type= src_table->table->s->db_type(); local_create_info.db_type= src_table->table->s->db_type();
...@@ -4603,6 +4605,9 @@ bool mysql_create_like_table(THD* thd, TABLE_LIST* table, TABLE_LIST* src_table, ...@@ -4603,6 +4605,9 @@ bool mysql_create_like_table(THD* thd, TABLE_LIST* table, TABLE_LIST* src_table,
thd->mdl_context.is_lock_owner(MDL_key::TABLE, table->db, thd->mdl_context.is_lock_owner(MDL_key::TABLE, table->db,
table->table_name, table->table_name,
MDL_EXCLUSIVE)); MDL_EXCLUSIVE));
DEBUG_SYNC(thd, "create_table_like_before_binlog");
/* /*
We have to write the query before we unlock the tables. We have to write the query before we unlock the tables.
*/ */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7