diff options
Diffstat (limited to 'mysql-test')
67 files changed, 453 insertions, 158 deletions
diff --git a/mysql-test/main/commit.result b/mysql-test/main/commit.result index f2e012d4782..44d46900d38 100644 --- a/mysql-test/main/commit.result +++ b/mysql-test/main/commit.result @@ -247,11 +247,13 @@ COMMIT; SET @@completion_type=1; COMMIT AND NO CHAIN; SET TRANSACTION ISOLATION LEVEL READ COMMITTED; -START TRANSACTION; TRUNCATE TABLE t1; +INSERT INTO t1 VALUES(100); +START TRANSACTION; INSERT INTO t1 VALUES (1000); SELECT * FROM t1; s1 +100 1000 Should read '1000' connection con1; @@ -260,6 +262,7 @@ COMMIT; connection default; SELECT * FROM t1; s1 +100 1000 Should only read the '1000' as this transaction is now in REP READ COMMIT AND NO CHAIN; diff --git a/mysql-test/main/commit.test b/mysql-test/main/commit.test index 762397dfa23..9f5e077fd2d 100644 --- a/mysql-test/main/commit.test +++ b/mysql-test/main/commit.test @@ -284,8 +284,11 @@ COMMIT; SET @@completion_type=1; COMMIT AND NO CHAIN; SET TRANSACTION ISOLATION LEVEL READ COMMITTED; -START TRANSACTION; TRUNCATE TABLE t1; +# MDEV-515 takes X-lock on the table for the first insert. +# So concurrent insert won't happen on the table +INSERT INTO t1 VALUES(100); +START TRANSACTION; INSERT INTO t1 VALUES (1000); SELECT * FROM t1; --echo Should read '1000' diff --git a/mysql-test/main/flush_read_lock.result b/mysql-test/main/flush_read_lock.result index 9a81cae1724..ae57788c7d4 100644 --- a/mysql-test/main/flush_read_lock.result +++ b/mysql-test/main/flush_read_lock.result @@ -1372,6 +1372,7 @@ unlock tables; connection default; # Reap XA COMMIT. delete from t3_trans; +INSERT INTO t3_trans VALUES(100); # # Check that XA COMMIT / ROLLBACK for prepared transaction from a # disconnected session is blocked by active FTWRL in another connection. diff --git a/mysql-test/main/flush_read_lock.test b/mysql-test/main/flush_read_lock.test index 205b8b302ea..40f8b2aec3b 100644 --- a/mysql-test/main/flush_read_lock.test +++ b/mysql-test/main/flush_read_lock.test @@ -1679,6 +1679,9 @@ connection default; --echo # Reap XA COMMIT. --reap delete from t3_trans; +# MDEV-515 takes X-lock on the table for the first insert. +# So concurrent insert won't happen on the table +INSERT INTO t3_trans VALUES(100); --echo # --echo # Check that XA COMMIT / ROLLBACK for prepared transaction from a --echo # disconnected session is blocked by active FTWRL in another connection. diff --git a/mysql-test/main/innodb_mysql_lock.result b/mysql-test/main/innodb_mysql_lock.result index 25cf2882cd0..6ca332018ca 100644 --- a/mysql-test/main/innodb_mysql_lock.result +++ b/mysql-test/main/innodb_mysql_lock.result @@ -12,6 +12,8 @@ connect con3,localhost,root,,; connection con1; set @@autocommit=0; CREATE TABLE t1(s1 INT UNIQUE) ENGINE=innodb; +INSERT INTO t1 VALUES (100); +COMMIT; INSERT INTO t1 VALUES (1); connection con2; set @@autocommit=0; diff --git a/mysql-test/main/innodb_mysql_lock.test b/mysql-test/main/innodb_mysql_lock.test index 6e746468dba..5ee688b1d6e 100644 --- a/mysql-test/main/innodb_mysql_lock.test +++ b/mysql-test/main/innodb_mysql_lock.test @@ -25,6 +25,11 @@ connect (con3,localhost,root,,); connection con1; set @@autocommit=0; CREATE TABLE t1(s1 INT UNIQUE) ENGINE=innodb; +# MDEV-515 takes X-lock on the table for the first insert. +# So concurrent DML won't happen on the table +INSERT INTO t1 VALUES (100); +COMMIT; + INSERT INTO t1 VALUES (1); connection con2; diff --git a/mysql-test/main/xa_prepared_binlog_off.result b/mysql-test/main/xa_prepared_binlog_off.result index ca19f6cdfaf..ebcb24d3af3 100644 --- a/mysql-test/main/xa_prepared_binlog_off.result +++ b/mysql-test/main/xa_prepared_binlog_off.result @@ -3,6 +3,7 @@ connection default; CREATE VIEW v_processlist as SELECT * FROM performance_schema.threads where type = 'FOREGROUND'; call mtr.add_suppression("Found 10 prepared XA transactions"); CREATE TABLE t (a INT) ENGINE=innodb; +INSERT INTO t VALUES(100); connect conn$index$type, 127.0.0.1,root,,test,$MASTER_MYPORT,; SET @@sql_log_bin = OFF; CREATE TEMPORARY TABLE tmp1 (a int) ENGINE=innodb; @@ -48,18 +49,21 @@ connect conn$index$type, 127.0.0.1,root,,test,$MASTER_MYPORT,; XA START 'trx1ro'; SELECT * from t ORDER BY a; a +100 XA END 'trx1ro'; XA PREPARE 'trx1ro'; connect conn$index$type, 127.0.0.1,root,,test,$MASTER_MYPORT,; XA START 'trx2ro'; SELECT * from t ORDER BY a; a +100 XA END 'trx2ro'; XA PREPARE 'trx2ro'; connect conn$index$type, 127.0.0.1,root,,test,$MASTER_MYPORT,; XA START 'trx3ro'; SELECT * from t ORDER BY a; a +100 XA END 'trx3ro'; XA PREPARE 'trx3ro'; connection default; @@ -402,6 +406,7 @@ ERROR XAE08: XAER_DUPID: The XID already exists XA ROLLBACK 'trx_19'; SELECT * FROM t; a +100 5 6 7 @@ -533,6 +538,7 @@ a 12 13 14 +100 XA END 'trx1ro'; XA PREPARE 'trx1ro'; connect conn$index$type, 127.0.0.1,root,,test,$MASTER_MYPORT,; @@ -559,6 +565,7 @@ a 12 13 14 +100 XA END 'trx2ro'; XA PREPARE 'trx2ro'; connect conn$index$type, 127.0.0.1,root,,test,$MASTER_MYPORT,; @@ -585,6 +592,7 @@ a 12 13 14 +100 XA END 'trx3ro'; XA PREPARE 'trx3ro'; connection default; @@ -927,6 +935,7 @@ ERROR XAE08: XAER_DUPID: The XID already exists XA ROLLBACK 'trx_19'; SELECT * FROM t; a +100 5 6 7 @@ -1036,7 +1045,7 @@ XA END 'one_phase_trx_4'; XA COMMIT 'one_phase_trx_4' ONE PHASE; SELECT SUM(a) FROM t; SUM(a) -290 +390 DROP TABLE t; DROP VIEW v_processlist; All transactions must be completed, to empty-list the following: diff --git a/mysql-test/suite/binlog/r/binlog_mdev342.result b/mysql-test/suite/binlog/r/binlog_mdev342.result index 7513e855497..6b3ba9d187a 100644 --- a/mysql-test/suite/binlog/r/binlog_mdev342.result +++ b/mysql-test/suite/binlog/r/binlog_mdev342.result @@ -2,6 +2,7 @@ SET GLOBAL max_binlog_size= 4096; SET GLOBAL innodb_flush_log_at_trx_commit= 1; RESET MASTER; CREATE TABLE t1 (a INT PRIMARY KEY, b MEDIUMTEXT) ENGINE=Innodb; +INSERT INTO t1 VALUES(100, "MDEV-515"); connect con1,localhost,root,,; SET DEBUG_SYNC= "binlog_open_before_update_index SIGNAL con1_ready WAIT_FOR con1_cont"; SET SESSION debug_dbug="+d,crash_create_critical_before_update_index"; @@ -20,6 +21,7 @@ connection default; SELECT a FROM t1 ORDER BY a; a 1 +100 show binary logs; Log_name File_size master-bin.000001 # @@ -32,6 +34,11 @@ master-bin.000001 # Binlog_checkpoint # # master-bin.000001 master-bin.000001 # Gtid # # GTID #-#-# master-bin.000001 # Query # # use `test`; CREATE TABLE t1 (a INT PRIMARY KEY, b MEDIUMTEXT) ENGINE=Innodb master-bin.000001 # Gtid # # BEGIN GTID #-#-# +master-bin.000001 # Annotate_rows # # INSERT INTO t1 VALUES(100, "MDEV-515") +master-bin.000001 # Table_map # # table_id: # (test.t1) +master-bin.000001 # Write_rows_v1 # # table_id: # flags: STMT_END_F +master-bin.000001 # Xid # # COMMIT /* XID */ +master-bin.000001 # Gtid # # BEGIN GTID #-#-# master-bin.000001 # Annotate_rows # # INSERT INTO t1 VALUES (1, REPEAT("x", 4100)) master-bin.000001 # Table_map # # table_id: # (test.t1) master-bin.000001 # Write_rows_v1 # # table_id: # flags: STMT_END_F diff --git a/mysql-test/suite/binlog/r/binlog_xa_prepared_disconnect.result b/mysql-test/suite/binlog/r/binlog_xa_prepared_disconnect.result index 9fda8ab3143..10a0fc39266 100644 --- a/mysql-test/suite/binlog/r/binlog_xa_prepared_disconnect.result +++ b/mysql-test/suite/binlog/r/binlog_xa_prepared_disconnect.result @@ -3,6 +3,7 @@ RESET MASTER; CREATE VIEW v_processlist as SELECT * FROM performance_schema.threads where type = 'FOREGROUND'; call mtr.add_suppression("Found 10 prepared XA transactions"); CREATE TABLE t (a INT) ENGINE=innodb; +INSERT INTO t VALUES(100); connect conn$index$type, 127.0.0.1,root,,test,$MASTER_MYPORT,; SET @@sql_log_bin = OFF; CREATE TEMPORARY TABLE tmp1 (a int) ENGINE=innodb; @@ -48,18 +49,21 @@ connect conn$index$type, 127.0.0.1,root,,test,$MASTER_MYPORT,; XA START 'trx1ro'; SELECT * from t ORDER BY a; a +100 XA END 'trx1ro'; XA PREPARE 'trx1ro'; connect conn$index$type, 127.0.0.1,root,,test,$MASTER_MYPORT,; XA START 'trx2ro'; SELECT * from t ORDER BY a; a +100 XA END 'trx2ro'; XA PREPARE 'trx2ro'; connect conn$index$type, 127.0.0.1,root,,test,$MASTER_MYPORT,; XA START 'trx3ro'; SELECT * from t ORDER BY a; a +100 XA END 'trx3ro'; XA PREPARE 'trx3ro'; connection default; @@ -402,6 +406,7 @@ ERROR XAE08: XAER_DUPID: The XID already exists XA ROLLBACK 'trx_19'; SELECT * FROM t; a +100 5 6 7 @@ -533,6 +538,7 @@ a 12 13 14 +100 XA END 'trx1ro'; XA PREPARE 'trx1ro'; connect conn$index$type, 127.0.0.1,root,,test,$MASTER_MYPORT,; @@ -559,6 +565,7 @@ a 12 13 14 +100 XA END 'trx2ro'; XA PREPARE 'trx2ro'; connect conn$index$type, 127.0.0.1,root,,test,$MASTER_MYPORT,; @@ -585,6 +592,7 @@ a 12 13 14 +100 XA END 'trx3ro'; XA PREPARE 'trx3ro'; connection default; @@ -927,6 +935,7 @@ ERROR XAE08: XAER_DUPID: The XID already exists XA ROLLBACK 'trx_19'; SELECT * FROM t; a +100 5 6 7 @@ -1036,7 +1045,7 @@ XA END 'one_phase_trx_4'; XA COMMIT 'one_phase_trx_4' ONE PHASE; SELECT SUM(a) FROM t; SUM(a) -290 +390 DROP TABLE t; DROP VIEW v_processlist; include/show_binlog_events.inc @@ -1048,6 +1057,9 @@ master-bin.000001 # Query # # use `mtr`; INSERT INTO test_suppressions (pattern) master-bin.000001 # Query # # COMMIT master-bin.000001 # Gtid # # GTID #-#-# master-bin.000001 # Query # # use `test`; CREATE TABLE t (a INT) ENGINE=innodb +master-bin.000001 # Gtid # # BEGIN GTID #-#-# +master-bin.000001 # Query # # use `test`; INSERT INTO t VALUES(100) +master-bin.000001 # Xid # # COMMIT /* XID */ master-bin.000001 # Gtid # # XA START X'7472785f30',X'',1 GTID #-#-# master-bin.000001 # Query # # use `test`; INSERT INTO t SET a=0 master-bin.000001 # Query # # XA END X'7472785f30',X'',1 diff --git a/mysql-test/suite/binlog/t/binlog_mdev342.test b/mysql-test/suite/binlog/t/binlog_mdev342.test index 024fa884f91..6d48ea129ee 100644 --- a/mysql-test/suite/binlog/t/binlog_mdev342.test +++ b/mysql-test/suite/binlog/t/binlog_mdev342.test @@ -11,7 +11,9 @@ SET GLOBAL innodb_flush_log_at_trx_commit= 1; RESET MASTER; CREATE TABLE t1 (a INT PRIMARY KEY, b MEDIUMTEXT) ENGINE=Innodb; - +# MDEV-515 takes X-lock on the table for the first insert +# In that case, Concurrent DML will get blocked +INSERT INTO t1 VALUES(100, "MDEV-515"); # One connection does an insert that causes a binlog rotate. # The rotate is paused after writing new file but before updating index. connect(con1,localhost,root,,); diff --git a/mysql-test/suite/binlog/t/binlog_xa_prepared.inc b/mysql-test/suite/binlog/t/binlog_xa_prepared.inc index b6306791cf4..e93832dbf08 100644 --- a/mysql-test/suite/binlog/t/binlog_xa_prepared.inc +++ b/mysql-test/suite/binlog/t/binlog_xa_prepared.inc @@ -54,6 +54,10 @@ CREATE VIEW v_processlist as SELECT * FROM performance_schema.threads where typ CREATE TABLE t (a INT) ENGINE=innodb; +# MDEV-515 takes X-lock on the table for the first insert. +# So concurrent insert won't happen on the table +INSERT INTO t VALUES(100); + # Counter is incremented at the end of post restart to # reflect number of loops done in correctness computation. --let $restart_number = 0 diff --git a/mysql-test/suite/binlog_encryption/rpl_parallel_gco_wait_kill.result b/mysql-test/suite/binlog_encryption/rpl_parallel_gco_wait_kill.result index 4472550c4f2..f12d19442f1 100644 --- a/mysql-test/suite/binlog_encryption/rpl_parallel_gco_wait_kill.result +++ b/mysql-test/suite/binlog_encryption/rpl_parallel_gco_wait_kill.result @@ -20,6 +20,7 @@ connect con_temp4,127.0.0.1,root,,test,$SERVER_MYPORT_1,; connect con_temp5,127.0.0.1,root,,test,$SERVER_MYPORT_1,; ALTER TABLE mysql.gtid_slave_pos ENGINE=InnoDB; CREATE TABLE t3 (a INT PRIMARY KEY, b INT) ENGINE=InnoDB; +INSERT INTO t3 VALUES(100, 100); connection server_2; connection server_1; SET sql_log_bin=0; @@ -136,6 +137,7 @@ a b 68 68 69 69 70 70 +100 100 SET debug_sync='RESET'; connection server_2; SET debug_sync='now SIGNAL d0_cont'; @@ -161,6 +163,7 @@ a b 68 68 69 69 70 70 +100 100 SET debug_sync='RESET'; SET GLOBAL slave_parallel_threads=0; SET GLOBAL slave_parallel_threads=10; @@ -190,6 +193,7 @@ a b 68 68 69 69 70 70 +100 100 SET sql_log_bin=0; DROP FUNCTION foo; CREATE FUNCTION foo(x INT, d1 VARCHAR(500), d2 VARCHAR(500)) @@ -225,6 +229,7 @@ SELECT * FROM t3 WHERE a >= 80 ORDER BY a; a b 80 0 81 10000 +100 100 connection server_2; SET debug_sync='now WAIT_FOR wait_queue_ready'; KILL THD_ID; @@ -244,6 +249,7 @@ a b 80 0 81 10000 82 0 +100 100 connection server_2; include/stop_slave.inc SET GLOBAL slave_parallel_mode=@old_parallel_mode; diff --git a/mysql-test/suite/binlog_encryption/rpl_parallel_ignored_errors.result b/mysql-test/suite/binlog_encryption/rpl_parallel_ignored_errors.result index 3dd5a3ea83c..ce11b814d44 100644 --- a/mysql-test/suite/binlog_encryption/rpl_parallel_ignored_errors.result +++ b/mysql-test/suite/binlog_encryption/rpl_parallel_ignored_errors.result @@ -13,6 +13,7 @@ include/start_slave.inc connection server_1; ALTER TABLE mysql.gtid_slave_pos ENGINE=InnoDB; CREATE TABLE t1 (a int PRIMARY KEY) ENGINE=InnoDB; +INSERT INTO t1 VALUES(1); include/save_master_gtid.inc connection server_2; include/sync_with_master_gtid.inc diff --git a/mysql-test/suite/binlog_encryption/rpl_parallel_slave_bgc_kill.result b/mysql-test/suite/binlog_encryption/rpl_parallel_slave_bgc_kill.result index 320bf0e49f8..ba131ea094f 100644 --- a/mysql-test/suite/binlog_encryption/rpl_parallel_slave_bgc_kill.result +++ b/mysql-test/suite/binlog_encryption/rpl_parallel_slave_bgc_kill.result @@ -17,6 +17,8 @@ ALTER TABLE mysql.gtid_slave_pos ENGINE=InnoDB; CREATE TABLE t1 (a int PRIMARY KEY) ENGINE=MyISAM; CREATE TABLE t2 (a int PRIMARY KEY) ENGINE=InnoDB; CREATE TABLE t3 (a INT PRIMARY KEY, b INT) ENGINE=InnoDB; +INSERT INTO t2 VALUES(100); +INSERT INTO t3 VALUES(100, 100); connection server_2; connection server_1; SET sql_log_bin=0; @@ -80,6 +82,7 @@ a b 32 32 33 33 34 34 +100 100 SET debug_sync='RESET'; connection server_2; SET sql_log_bin=0; @@ -98,6 +101,7 @@ STOP SLAVE IO_THREAD; SELECT * FROM t3 WHERE a >= 30 ORDER BY a; a b 31 31 +100 100 SET debug_sync='RESET'; SET GLOBAL slave_parallel_threads=0; SET GLOBAL slave_parallel_threads=10; @@ -121,6 +125,7 @@ a b 33 33 34 34 39 0 +100 100 SET sql_log_bin=0; DROP FUNCTION foo; CREATE FUNCTION foo(x INT, d1 VARCHAR(500), d2 VARCHAR(500)) @@ -179,6 +184,7 @@ a b 42 42 43 43 44 44 +100 100 SET debug_sync='RESET'; connection server_2; SET debug_sync='now WAIT_FOR t2_query'; @@ -211,6 +217,7 @@ a b 43 43 44 44 49 0 +100 100 SET sql_log_bin=0; DROP FUNCTION foo; CREATE FUNCTION foo(x INT, d1 VARCHAR(500), d2 VARCHAR(500)) @@ -274,6 +281,7 @@ a b 52 52 53 53 54 54 +100 100 SET debug_sync='RESET'; connection server_2; SET debug_sync='now WAIT_FOR t2_query'; @@ -286,6 +294,7 @@ include/wait_for_slave_sql_error.inc [errno=1317,1927,1964] SELECT * FROM t3 WHERE a >= 50 ORDER BY a; a b 51 51 +100 100 SET debug_sync='RESET'; SET GLOBAL slave_parallel_threads=0; SET GLOBAL slave_parallel_threads=10; @@ -309,6 +318,7 @@ a b 53 53 54 54 59 0 +100 100 connection server_2; include/stop_slave.inc CHANGE MASTER TO master_use_gtid=slave_pos; diff --git a/mysql-test/suite/binlog_encryption/rpl_parallel_stop_slave.result b/mysql-test/suite/binlog_encryption/rpl_parallel_stop_slave.result index 6c9fd168e73..0c810d2a3f4 100644 --- a/mysql-test/suite/binlog_encryption/rpl_parallel_stop_slave.result +++ b/mysql-test/suite/binlog_encryption/rpl_parallel_stop_slave.result @@ -16,6 +16,8 @@ ALTER TABLE mysql.gtid_slave_pos ENGINE=InnoDB; CREATE TABLE t1 (a int PRIMARY KEY) ENGINE=MyISAM; CREATE TABLE t2 (a int PRIMARY KEY) ENGINE=InnoDB; CREATE TABLE t3 (a INT PRIMARY KEY, b INT) ENGINE=InnoDB; +INSERT INTO t2 VALUES(100); +INSERT INTO t3 VALUES(100, 100); connection server_2; include/stop_slave.inc connection server_1; @@ -55,9 +57,11 @@ SELECT * FROM t2 WHERE a >= 20 ORDER BY a; a 20 21 +100 SELECT * FROM t3 WHERE a >= 20 ORDER BY a; a b 20 20 +100 100 include/start_slave.inc SELECT * FROM t1 WHERE a >= 20 ORDER BY a; a @@ -66,11 +70,13 @@ SELECT * FROM t2 WHERE a >= 20 ORDER BY a; a 20 21 +100 SELECT * FROM t3 WHERE a >= 20 ORDER BY a; a b 20 20 21 21 22 22 +100 100 connection server_2; include/stop_slave.inc SET GLOBAL slave_parallel_mode=@old_parallel_mode; diff --git a/mysql-test/suite/innodb/r/alter_candidate_key.result b/mysql-test/suite/innodb/r/alter_candidate_key.result index 23989e0da5f..b0b56047abc 100644 --- a/mysql-test/suite/innodb/r/alter_candidate_key.result +++ b/mysql-test/suite/innodb/r/alter_candidate_key.result @@ -66,6 +66,7 @@ test.t1 check status OK DROP TABLE t1; SET SQL_MODE= strict_trans_tables; CREATE TABLE t1(a INT UNIQUE) ENGINE=InnoDB; +INSERT INTO t1 VALUES(3); SET DEBUG_SYNC='row_log_table_apply1_before SIGNAL dml WAIT_FOR dml_done'; ALTER TABLE t1 MODIFY COLUMN a INT NOT NULL; connection con1; diff --git a/mysql-test/suite/innodb/r/binlog_consistent.result b/mysql-test/suite/innodb/r/binlog_consistent.result index 0562a92ef68..cceca394166 100644 --- a/mysql-test/suite/innodb/r/binlog_consistent.result +++ b/mysql-test/suite/innodb/r/binlog_consistent.result @@ -5,6 +5,7 @@ connect con3,localhost,root,,; connect con4,localhost,root,,; connection default; CREATE TABLE t1 (a INT, b VARCHAR(100), PRIMARY KEY (a,b)) ENGINE=innodb; +INSERT INTO t1 VALUES(9, ""); SHOW MASTER STATUS; File Position Binlog_Do_DB Binlog_Ignore_DB master-bin.000001 <pos> @@ -39,6 +40,7 @@ connection default; SELECT * FROM t1 ORDER BY a,b; a b 0 +9 SHOW STATUS LIKE 'binlog_snapshot_%'; Variable_name Value Binlog_snapshot_file master-bin.000001 @@ -61,6 +63,7 @@ connection default; SELECT * FROM t1 ORDER BY a,b; a b 0 +9 SHOW STATUS LIKE 'binlog_snapshot_%'; Variable_name Value Binlog_snapshot_file master-bin.000001 @@ -80,6 +83,9 @@ include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Gtid # # GTID #-#-# master-bin.000001 # Query # # use `test`; CREATE TABLE t1 (a INT, b VARCHAR(100), PRIMARY KEY (a,b)) ENGINE=innodb +master-bin.000001 # Gtid # # BEGIN GTID #-#-# +master-bin.000001 # Query # # use `test`; INSERT INTO t1 VALUES(9, "") +master-bin.000001 # Xid # # COMMIT /* XID */ master-bin.000001 # Gtid # # GTID #-#-# master-bin.000001 # Query # # use `test`; CREATE TABLE t2 (a INT PRIMARY KEY) ENGINE=myisam master-bin.000001 # Gtid # # BEGIN GTID #-#-# diff --git a/mysql-test/suite/innodb/r/ddl_purge.result b/mysql-test/suite/innodb/r/ddl_purge.result index 45f4c99e97b..a1d96de24ca 100644 --- a/mysql-test/suite/innodb/r/ddl_purge.result +++ b/mysql-test/suite/innodb/r/ddl_purge.result @@ -1,5 +1,6 @@ CREATE TABLE t0 (pk INT PRIMARY KEY) ENGINE=InnoDB; CREATE TABLE t1 (pk INT PRIMARY KEY, b INT) ENGINE=InnoDB; +INSERT INTO t0 VALUES(100); connect con1,localhost,root,,test; BEGIN; INSERT INTO t0 SET pk=1; diff --git a/mysql-test/suite/innodb/r/group_commit.result b/mysql-test/suite/innodb/r/group_commit.result index e2fb89767d4..5fd7f9c9155 100644 --- a/mysql-test/suite/innodb/r/group_commit.result +++ b/mysql-test/suite/innodb/r/group_commit.result @@ -1,4 +1,5 @@ CREATE TABLE t1 (a VARCHAR(10) PRIMARY KEY) ENGINE=innodb; +INSERT INTO t1 VALUES(100); SELECT variable_value INTO @commits FROM information_schema.global_status WHERE variable_name = 'binlog_commits'; SELECT variable_value INTO @group_commits FROM information_schema.global_status @@ -32,11 +33,13 @@ SET DEBUG_SYNC= "now WAIT_FOR group2_con4"; SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED; SELECT * FROM t1 ORDER BY a; a +100 SET DEBUG_SYNC= "now SIGNAL group2_queued"; connection con1; connection default; SELECT * FROM t1 ORDER BY a; a +100 con1 connection con5; SET DEBUG_SYNC= "commit_before_get_LOCK_after_binlog_sync SIGNAL group3_con5"; @@ -51,11 +54,13 @@ connection default; SET DEBUG_SYNC= "now WAIT_FOR group3_con5"; SELECT * FROM t1 ORDER BY a; a +100 con1 SET DEBUG_SYNC= "now SIGNAL group3_committed"; SET DEBUG_SYNC= "now WAIT_FOR group2_visible"; SELECT * FROM t1 ORDER BY a; a +100 con1 con2 con3 @@ -69,6 +74,7 @@ connection con6; connection default; SELECT * FROM t1 ORDER BY a; a +100 con1 con2 con3 diff --git a/mysql-test/suite/innodb/r/group_commit_no_optimize_thread.result b/mysql-test/suite/innodb/r/group_commit_no_optimize_thread.result index 41e9f6a9d08..e22589ed255 100644 --- a/mysql-test/suite/innodb/r/group_commit_no_optimize_thread.result +++ b/mysql-test/suite/innodb/r/group_commit_no_optimize_thread.result @@ -1,4 +1,5 @@ CREATE TABLE t1 (a VARCHAR(10) PRIMARY KEY) ENGINE=innodb; +INSERT INTO t1 VALUES("default"); SELECT variable_value INTO @commits FROM information_schema.global_status WHERE variable_name = 'binlog_commits'; SELECT variable_value INTO @group_commits FROM information_schema.global_status @@ -32,12 +33,14 @@ SET DEBUG_SYNC= "now WAIT_FOR group2_con4"; SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED; SELECT * FROM t1 ORDER BY a; a +default SET DEBUG_SYNC= "now SIGNAL group2_queued"; connection con1; connection default; SELECT * FROM t1 ORDER BY a; a con1 +default connection con5; SET DEBUG_SYNC= "commit_before_get_LOCK_after_binlog_sync SIGNAL group3_con5"; SET DEBUG_SYNC= "commit_after_get_LOCK_log SIGNAL con5_leader WAIT_FOR con6_queued"; @@ -52,6 +55,7 @@ SET DEBUG_SYNC= "now WAIT_FOR group3_con5"; SELECT * FROM t1 ORDER BY a; a con1 +default SET DEBUG_SYNC= "now SIGNAL group3_committed"; SET DEBUG_SYNC= "now WAIT_FOR group2_visible"; SELECT * FROM t1 ORDER BY a; @@ -60,6 +64,7 @@ con1 con2 con3 con4 +default SET DEBUG_SYNC= "now SIGNAL group2_checked"; connection con2; connection con3; @@ -75,6 +80,7 @@ con3 con4 con5 con6 +default SELECT variable_value - @commits FROM information_schema.global_status WHERE variable_name = 'binlog_commits'; variable_value - @commits diff --git a/mysql-test/suite/innodb/r/innodb-lock.result b/mysql-test/suite/innodb/r/innodb-lock.result index 1fe0d263fef..83bed139da8 100644 --- a/mysql-test/suite/innodb/r/innodb-lock.result +++ b/mysql-test/suite/innodb/r/innodb-lock.result @@ -147,6 +147,8 @@ DROP TABLE t1, t2; # CREATE TABLE t1 (pk INT AUTO_INCREMENT PRIMARY KEY) ENGINE=InnoDB PARTITION BY key (pk) PARTITIONS 2; +INSERT INTO t1 VALUES(100); +INSERT INTO t1 VALUES(101); CREATE TABLE t2 (a INT) ENGINE=InnoDB; INSERT INTO t2 VALUES (1),(2),(3),(4),(5),(6); CREATE TABLE t3 (b INT) ENGINE=InnoDB; diff --git a/mysql-test/suite/innodb/r/innodb-table-online.result b/mysql-test/suite/innodb/r/innodb-table-online.result index 7872332a4a8..70c19eefd0d 100644 --- a/mysql-test/suite/innodb/r/innodb-table-online.result +++ b/mysql-test/suite/innodb/r/innodb-table-online.result @@ -18,15 +18,12 @@ ddl_log_file_alter_table 0 SET DEBUG_SYNC = 'RESET'; SET DEBUG_SYNC = 'write_row_noreplace SIGNAL have_handle WAIT_FOR go_ahead'; INSERT INTO t1 VALUES(1,2,3); -# Establish session con1 (user=root) connect con1,localhost,root,,; -connection con1; SET DEBUG_SYNC = 'now WAIT_FOR have_handle'; SET lock_wait_timeout = 1; ALTER TABLE t1 ROW_FORMAT=REDUNDANT; ERROR HY000: Lock wait timeout exceeded; try restarting transaction SET DEBUG_SYNC = 'now SIGNAL go_ahead'; -# session default connection default; ERROR 23000: Duplicate entry '1' for key 'PRIMARY' SELECT name, count FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE subsystem = 'ddl'; @@ -37,7 +34,6 @@ ddl_online_create_index 0 ddl_pending_alter_table 0 ddl_sort_file_alter_table 0 ddl_log_file_alter_table 0 -# session con1 connection con1; SET @saved_debug_dbug = @@SESSION.debug_dbug; SET DEBUG_DBUG = '+d,innodb_OOM_prepare_inplace_alter'; @@ -55,7 +51,6 @@ SET SESSION DEBUG = @saved_debug_dbug; Warnings: Warning 1287 '@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead ALTER TABLE t1 ROW_FORMAT=REDUNDANT, ALGORITHM=INPLACE, LOCK=NONE; -# session default connection default; SHOW CREATE TABLE t1; Table Create Table @@ -67,22 +62,17 @@ t1 CREATE TABLE `t1` ( ) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=REDUNDANT BEGIN; INSERT INTO t1 VALUES(7,4,2); -# session con1 connection con1; SET DEBUG_SYNC = 'row_log_table_apply1_before SIGNAL scanned WAIT_FOR insert_done'; ALTER TABLE t1 DROP PRIMARY KEY, ADD UNIQUE INDEX(c2); ERROR HY000: Lock wait timeout exceeded; try restarting transaction -# session default connection default; COMMIT; -# session con1 connection con1; ALTER TABLE t1 DROP PRIMARY KEY, ADD UNIQUE INDEX(c2); ERROR 23000: Duplicate entry '4' for key 'c2' -# session default connection default; DELETE FROM t1 WHERE c1 = 7; -# session con1 connection con1; ALTER TABLE t1 DROP PRIMARY KEY, ADD UNIQUE INDEX(c2), ROW_FORMAT=COMPACT, LOCK = SHARED, ALGORITHM = INPLACE; @@ -100,7 +90,6 @@ t1 CREATE TABLE `t1` ( UNIQUE KEY `c2_2` (`c2`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT ALTER TABLE t1 DROP INDEX c2, ADD PRIMARY KEY(c1); -# session default connection default; SET DEBUG_SYNC = 'now WAIT_FOR scanned'; SELECT name, count FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE subsystem = 'ddl'; @@ -114,13 +103,10 @@ ddl_log_file_alter_table 0 BEGIN; INSERT INTO t1 VALUES(4,7,2); SET DEBUG_SYNC = 'now SIGNAL insert_done'; -# session con1 connection con1; ERROR 23000: Duplicate entry '4' for key 'PRIMARY' -# session default connection default; ROLLBACK; -# session con1 connection con1; SHOW CREATE TABLE t1; Table Create Table @@ -142,7 +128,6 @@ ddl_online_create_index 0 ddl_pending_alter_table 0 ddl_sort_file_alter_table 0 ddl_log_file_alter_table 0 -# session default connection default; INSERT INTO t1 VALUES(6,3,1); ERROR 23000: Duplicate entry '3' for key 'c2_2' @@ -152,14 +137,12 @@ DROP INDEX c2_2 ON t1; BEGIN; INSERT INTO t1 VALUES(7,4,2); ROLLBACK; -# session con1 connection con1; KILL QUERY @id; ERROR 70100: Query execution was interrupted SET DEBUG_SYNC = 'row_log_table_apply1_before SIGNAL rebuilt WAIT_FOR dml_done'; SET DEBUG_SYNC = 'row_log_table_apply2_before SIGNAL applied WAIT_FOR kill_done'; ALTER TABLE t1 ROW_FORMAT=REDUNDANT; -# session default connection default; SET DEBUG_SYNC = 'now WAIT_FOR rebuilt'; SELECT name, count FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE subsystem = 'ddl'; @@ -176,7 +159,6 @@ ROLLBACK; SET DEBUG_SYNC = 'now SIGNAL dml_done WAIT_FOR applied'; KILL QUERY @id; SET DEBUG_SYNC = 'now SIGNAL kill_done'; -# session con1 connection con1; ERROR 70100: Query execution was interrupted SELECT name, count FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE subsystem = 'ddl'; @@ -187,7 +169,6 @@ ddl_online_create_index 0 ddl_pending_alter_table 0 ddl_sort_file_alter_table 0 ddl_log_file_alter_table 0 -# session default connection default; CHECK TABLE t1; Table Op Msg_type Msg_text @@ -212,7 +193,6 @@ WHERE variable_name = 'innodb_encryption_n_merge_blocks_decrypted'); SET @rowlog_encrypt_0= (SELECT variable_value FROM information_schema.global_status WHERE variable_name = 'innodb_encryption_n_rowlog_blocks_encrypted'); -# session con1 connection con1; SHOW CREATE TABLE t1; Table Create Table @@ -227,7 +207,6 @@ SET DEBUG_SYNC = 'row_log_table_apply1_before SIGNAL rebuilt2 WAIT_FOR dml2_done SET lock_wait_timeout = 10; ALTER TABLE t1 ROW_FORMAT=COMPACT PAGE_COMPRESSED = YES PAGE_COMPRESSION_LEVEL = 1, ALGORITHM = INPLACE; -# session default connection default; INSERT INTO t1 SELECT 80 + c1, c2, c3 FROM t1; INSERT INTO t1 SELECT 160 + c1, c2, c3 FROM t1; @@ -290,7 +269,6 @@ SELECT sort_balance @merge_encrypt_1>@merge_encrypt_0 @merge_decrypt_1>@merge_decrypt_0 @rowlog_encrypt_1>@rowlog_encrypt_0 0 0 0 0 SET DEBUG_SYNC = 'now SIGNAL dml2_done'; -# session con1 connection con1; ERROR HY000: Creating index 'PRIMARY' required more than 'innodb_online_alter_log_max_size' bytes of modification log. Please try again SELECT name, count FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE subsystem = 'ddl'; @@ -321,7 +299,6 @@ ERROR 23000: Duplicate entry '5' for key 'PRIMARY' ALTER TABLE t1 DROP PRIMARY KEY, ADD PRIMARY KEY(c22f,c1,c4(5)), CHANGE c2 c22f INT, CHANGE c3 c3 CHAR(255) NULL, CHANGE c1 c1 INT AFTER c22f, ADD COLUMN c4 VARCHAR(6) DEFAULT 'Online', LOCK=NONE; -# session default connection default; SET DEBUG_SYNC = 'now WAIT_FOR rebuilt3'; SELECT name, count FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE subsystem = 'ddl'; @@ -349,7 +326,6 @@ ddl_pending_alter_table 1 ddl_sort_file_alter_table 2 ddl_log_file_alter_table 2 SET DEBUG_SYNC = 'now SIGNAL dml3_done'; -# session con1 connection con1; SELECT name, count FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE subsystem = 'ddl'; name count @@ -405,20 +381,16 @@ SET DEBUG_SYNC = 'row_log_table_apply1_before SIGNAL c3p5_created0 WAIT_FOR ins_ ALTER TABLE t1 MODIFY c3 CHAR(255) NOT NULL, DROP COLUMN c22f, DROP PRIMARY KEY, ADD PRIMARY KEY(c1,c4(5)), ADD COLUMN c5 CHAR(5) DEFAULT 'tired' FIRST; -# session default connection default; SET DEBUG_SYNC = 'now WAIT_FOR c3p5_created0'; BEGIN; INSERT INTO t1 VALUES(347,33101,'Pikku kakkosen posti','YLETV2'); INSERT INTO t1 VALUES(33101,347,NULL,''); SET DEBUG_SYNC = 'now SIGNAL ins_done0'; -# session con1 connection con1; ERROR 01000: Data truncated for column 'c3' at row 323 -# session default connection default; ROLLBACK; -# session con1 connection con1; ALTER TABLE t1 MODIFY c3 CHAR(255) NOT NULL; SET DEBUG_SYNC = 'row_log_table_apply1_before SIGNAL c3p5_created WAIT_FOR ins_done'; @@ -426,14 +398,12 @@ ALTER TABLE t1 DROP PRIMARY KEY, DROP COLUMN c22f, ADD COLUMN c6 VARCHAR(1000) DEFAULT 'I love tracking down hard-to-reproduce bugs.', ADD PRIMARY KEY c3p5(c3(5), c6(2)); -# session default connection default; SET DEBUG_SYNC = 'now WAIT_FOR c3p5_created'; SET DEBUG_SYNC = 'ib_after_row_insert SIGNAL ins_done WAIT_FOR ddl_timed_out'; INSERT INTO t1 VALUES(347,33101,NULL,''); ERROR 23000: Column 'c3' cannot be null INSERT INTO t1 VALUES(347,33101,'Pikku kakkosen posti',''); -# session con1 connection con1; ERROR HY000: Lock wait timeout exceeded; try restarting transaction SET DEBUG_SYNC = 'now SIGNAL ddl_timed_out'; @@ -445,7 +415,6 @@ ddl_online_create_index 0 ddl_pending_alter_table 0 ddl_sort_file_alter_table 6 ddl_log_file_alter_table 2 -# session default connection default; SELECT COUNT(*) FROM t1; COUNT(*) @@ -463,12 +432,8 @@ c22f c1 c3 c4 5 36 36foofoofoofoofoofoofoofoofoofoofoofoofoofoofoofoofoofoofoofoofoofoofoofoofoofoofoofoofoofoofoofoofoofoofoofoo Online 5 41 41foofoofoofoofoofoofoofoofoofoofoofoofoofoofoofoofoofoofoofoofoofoofoofoofoofoofoofoofoofoofoofoofoofoofoofoofoofoofoofoofoo Online 5 46 46foofoofoofoofoofoofoofoofoofoofoofoofoofoofoofoofoofoofoofoofoofoofoofoofoofoofoofoofoofoofoofoofoofoofoofoofoofoofoofoofoofoofoofoofoofoo Online -# session con1 connection con1; ALTER TABLE t1 DISCARD TABLESPACE; -# Disconnect session con1 -disconnect con1; -# session default connection default; SHOW CREATE TABLE t1; Table Create Table @@ -479,9 +444,25 @@ t1 CREATE TABLE `t1` ( `c4` varchar(6) NOT NULL DEFAULT 'Online', PRIMARY KEY (`c22f`,`c1`,`c4`(5)) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=REDUNDANT -SET DEBUG_SYNC = 'RESET'; SET GLOBAL innodb_monitor_disable = module_ddl; DROP TABLE t1; +CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB; +connection con1; +SET DEBUG_SYNC = 'row_log_table_apply1_before SIGNAL created WAIT_FOR ins'; +ALTER TABLE t1 FORCE; +connection default; +SET DEBUG_SYNC = 'now WAIT_FOR created'; +BEGIN; +INSERT INTO t1 VALUES(1); +ROLLBACK; +SET DEBUG_SYNC = 'now SIGNAL ins'; +connection con1; +disconnect con1; +connection default; +SELECT * FROM t1; +a +DROP TABLE t1; +SET DEBUG_SYNC = 'RESET'; SET GLOBAL innodb_file_per_table = @global_innodb_file_per_table_orig; SET GLOBAL innodb_monitor_enable = default; SET GLOBAL innodb_monitor_disable = default; diff --git a/mysql-test/suite/innodb/r/lock_insert_into_empty.result b/mysql-test/suite/innodb/r/lock_insert_into_empty.result new file mode 100644 index 00000000000..434edffe729 --- /dev/null +++ b/mysql-test/suite/innodb/r/lock_insert_into_empty.result @@ -0,0 +1,24 @@ +CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB; +CREATE TABLE t2 (a INT PRIMARY KEY) ENGINE=InnoDB; +INSERT INTO t1 VALUES(0); +BEGIN; +DELETE FROM t1; +INSERT INTO t2 VALUES(1),(1); +ERROR 23000: Duplicate entry '1' for key 'PRIMARY' +connect con1,localhost,root,,; +BEGIN; +SELECT * FROM t2 LOCK IN SHARE MODE; +a +connection default; +SET innodb_lock_wait_timeout=1; +INSERT INTO t2 VALUES(2); +ERROR HY000: Lock wait timeout exceeded; try restarting transaction +disconnect con1; +INSERT INTO t2 VALUES(3); +COMMIT; +SELECT * FROM t1; +a +SELECT * FROM t2; +a +3 +DROP TABLE t1, t2; diff --git a/mysql-test/suite/innodb/t/alter_candidate_key.test b/mysql-test/suite/innodb/t/alter_candidate_key.test index 7429cd89a1a..979d8fa4fee 100644 --- a/mysql-test/suite/innodb/t/alter_candidate_key.test +++ b/mysql-test/suite/innodb/t/alter_candidate_key.test @@ -42,6 +42,9 @@ DROP TABLE t1; SET SQL_MODE= strict_trans_tables; CREATE TABLE t1(a INT UNIQUE) ENGINE=InnoDB; +# MDEV-515 takes X-lock on the table for the first insert. +# So concurrent insert won't happen on the table +INSERT INTO t1 VALUES(3); SET DEBUG_SYNC='row_log_table_apply1_before SIGNAL dml WAIT_FOR dml_done'; --send ALTER TABLE t1 MODIFY COLUMN a INT NOT NULL connection con1; diff --git a/mysql-test/suite/innodb/t/autoinc_persist.test b/mysql-test/suite/innodb/t/autoinc_persist.test index fd85b45fbfa..6e094b40e02 100644 --- a/mysql-test/suite/innodb/t/autoinc_persist.test +++ b/mysql-test/suite/innodb/t/autoinc_persist.test @@ -410,6 +410,17 @@ INSERT INTO mdev6076a SET b=NULL; SELECT * FROM mdev6076a; INSERT INTO mdev6076b SET b=NULL; SELECT * FROM mdev6076b; +# MDEV-515 resets the PAGE_ROOT_AUTOINC field in +# root page during rollback. +--disable_query_log +BEGIN; +let $i = 55; +WHILE ($i) { + eval INSERT INTO mdev6076empty SET b=$i; + dec $i; +} +ROLLBACK; +--enable_query_log INSERT INTO mdev6076empty SET b=NULL; SELECT * FROM mdev6076empty; DROP TABLE mdev6076a, mdev6076b, mdev6076empty; diff --git a/mysql-test/suite/innodb/t/binlog_consistent.test b/mysql-test/suite/innodb/t/binlog_consistent.test index 2a735a30a0e..6a1935f80c4 100644 --- a/mysql-test/suite/innodb/t/binlog_consistent.test +++ b/mysql-test/suite/innodb/t/binlog_consistent.test @@ -16,7 +16,10 @@ connect(con4,localhost,root,,); connection default; CREATE TABLE t1 (a INT, b VARCHAR(100), PRIMARY KEY (a,b)) ENGINE=innodb; -let pos=`select $binlog_start_pos + 254`; +# MDEV-515 takes X-lock on the table for the first insert. +# So concurrent insert won't happen on the table +INSERT INTO t1 VALUES(9, ""); +let pos=`select $binlog_start_pos + 422`; --replace_result $pos <pos> SHOW MASTER STATUS; --replace_result $pos <pos> @@ -53,10 +56,10 @@ COMMIT; connection default; SELECT * FROM t1 ORDER BY a,b; -let pos=`select $binlog_start_pos + 788`; +let pos=`select $binlog_start_pos + 956`; --replace_result $pos <pos> SHOW STATUS LIKE 'binlog_snapshot_%'; -let pos=`select $binlog_start_pos + 1164`; +let pos=`select $binlog_start_pos + 1332`; --replace_result $pos <pos> SHOW MASTER STATUS; SELECT * FROM t2 ORDER BY a; @@ -74,7 +77,7 @@ FLUSH LOGS; connection default; SELECT * FROM t1 ORDER BY a,b; -let pos=`select $binlog_start_pos + 788`; +let pos=`select $binlog_start_pos + 956`; --replace_result $pos <pos> SHOW STATUS LIKE 'binlog_snapshot_%'; let pos=`select $binlog_start_pos + 131`; diff --git a/mysql-test/suite/innodb/t/ddl_purge.test b/mysql-test/suite/innodb/t/ddl_purge.test index 60d17acead8..678cb597c03 100644 --- a/mysql-test/suite/innodb/t/ddl_purge.test +++ b/mysql-test/suite/innodb/t/ddl_purge.test @@ -4,7 +4,9 @@ CREATE TABLE t0 (pk INT PRIMARY KEY) ENGINE=InnoDB; CREATE TABLE t1 (pk INT PRIMARY KEY, b INT) ENGINE=InnoDB; - +# MDEV-515 takes X-lock on the table for the first insert. +# So concurrent insert won't happen on the table +INSERT INTO t0 VALUES(100); --connect (con1,localhost,root,,test) BEGIN; INSERT INTO t0 SET pk=1; diff --git a/mysql-test/suite/innodb/t/group_commit.test b/mysql-test/suite/innodb/t/group_commit.test index 692e06f38b8..3a2018bec5d 100644 --- a/mysql-test/suite/innodb/t/group_commit.test +++ b/mysql-test/suite/innodb/t/group_commit.test @@ -10,6 +10,9 @@ # to check some edge case for concurrency control. CREATE TABLE t1 (a VARCHAR(10) PRIMARY KEY) ENGINE=innodb; +# MDEV-515 takes X-lock on the table for the first insert. +# So concurrent insert won't happen on the table +INSERT INTO t1 VALUES(100); SELECT variable_value INTO @commits FROM information_schema.global_status WHERE variable_name = 'binlog_commits'; diff --git a/mysql-test/suite/innodb/t/group_commit_no_optimize_thread.test b/mysql-test/suite/innodb/t/group_commit_no_optimize_thread.test index 85c0e295424..107fc6f4056 100644 --- a/mysql-test/suite/innodb/t/group_commit_no_optimize_thread.test +++ b/mysql-test/suite/innodb/t/group_commit_no_optimize_thread.test @@ -10,6 +10,9 @@ # to check some edge case for concurrency control. CREATE TABLE t1 (a VARCHAR(10) PRIMARY KEY) ENGINE=innodb; +# MDEV-515 takes X-LOCK on the table for the first insert. +# So concurrent insert won't happen on the table +INSERT INTO t1 VALUES("default"); SELECT variable_value INTO @commits FROM information_schema.global_status WHERE variable_name = 'binlog_commits'; diff --git a/mysql-test/suite/innodb/t/innodb-lock.test b/mysql-test/suite/innodb/t/innodb-lock.test index 9e5505270be..84219db111e 100644 --- a/mysql-test/suite/innodb/t/innodb-lock.test +++ b/mysql-test/suite/innodb/t/innodb-lock.test @@ -199,6 +199,10 @@ DROP TABLE t1, t2; CREATE TABLE t1 (pk INT AUTO_INCREMENT PRIMARY KEY) ENGINE=InnoDB PARTITION BY key (pk) PARTITIONS 2; +# MDEV-515 takes X-lock on the table for the first insert. +# So concurrent insert won't happen on the table +INSERT INTO t1 VALUES(100); +INSERT INTO t1 VALUES(101); CREATE TABLE t2 (a INT) ENGINE=InnoDB; INSERT INTO t2 VALUES (1),(2),(3),(4),(5),(6); diff --git a/mysql-test/suite/innodb/t/innodb-table-online.test b/mysql-test/suite/innodb/t/innodb-table-online.test index ce014b0aa00..be346001953 100644 --- a/mysql-test/suite/innodb/t/innodb-table-online.test +++ b/mysql-test/suite/innodb/t/innodb-table-online.test @@ -30,9 +30,7 @@ SET DEBUG_SYNC = 'write_row_noreplace SIGNAL have_handle WAIT_FOR go_ahead'; --send INSERT INTO t1 VALUES(1,2,3); ---echo # Establish session con1 (user=root) connect (con1,localhost,root,,); -connection con1; # This should block at the end because of the INSERT in connection default # is holding a metadata lock. @@ -42,13 +40,11 @@ SET lock_wait_timeout = 1; ALTER TABLE t1 ROW_FORMAT=REDUNDANT; SET DEBUG_SYNC = 'now SIGNAL go_ahead'; ---echo # session default connection default; --error ER_DUP_ENTRY reap; eval $innodb_metrics_select; ---echo # session con1 connection con1; SET @saved_debug_dbug = @@SESSION.debug_dbug; SET DEBUG_DBUG = '+d,innodb_OOM_prepare_inplace_alter'; @@ -61,14 +57,12 @@ ALTER TABLE t1 ROW_FORMAT=REDUNDANT, ALGORITHM=INPLACE, LOCK=NONE; SET SESSION DEBUG = @saved_debug_dbug; ALTER TABLE t1 ROW_FORMAT=REDUNDANT, ALGORITHM=INPLACE, LOCK=NONE; ---echo # session default connection default; SHOW CREATE TABLE t1; # Insert a duplicate entry (4) for the upcoming UNIQUE INDEX(c2). BEGIN; INSERT INTO t1 VALUES(7,4,2); ---echo # session con1 connection con1; # This DEBUG_SYNC should not kick in yet, because the duplicate key will be # detected before we get a chance to apply the online log. @@ -78,20 +72,16 @@ SET DEBUG_SYNC = 'row_log_table_apply1_before SIGNAL scanned WAIT_FOR insert_don --error ER_LOCK_WAIT_TIMEOUT ALTER TABLE t1 DROP PRIMARY KEY, ADD UNIQUE INDEX(c2); ---echo # session default connection default; COMMIT; ---echo # session con1 connection con1; --error ER_DUP_ENTRY ALTER TABLE t1 DROP PRIMARY KEY, ADD UNIQUE INDEX(c2); ---echo # session default connection default; DELETE FROM t1 WHERE c1 = 7; ---echo # session con1 connection con1; ALTER TABLE t1 DROP PRIMARY KEY, ADD UNIQUE INDEX(c2), ROW_FORMAT=COMPACT, LOCK = SHARED, ALGORITHM = INPLACE; @@ -106,7 +96,6 @@ SHOW CREATE TABLE t1; --send ALTER TABLE t1 DROP INDEX c2, ADD PRIMARY KEY(c1); ---echo # session default connection default; SET DEBUG_SYNC = 'now WAIT_FOR scanned'; eval $innodb_metrics_select; @@ -116,7 +105,6 @@ BEGIN; INSERT INTO t1 VALUES(4,7,2); SET DEBUG_SYNC = 'now SIGNAL insert_done'; ---echo # session con1 connection con1; # Because the modification log will be applied in order and we did # not roll back before the log apply, there will be a duplicate key @@ -124,11 +112,9 @@ connection con1; --error ER_DUP_ENTRY reap; ---echo # session default connection default; ROLLBACK; ---echo # session con1 connection con1; SHOW CREATE TABLE t1; # Now, rebuild the table without any concurrent DML, while no duplicate exists. @@ -137,7 +123,6 @@ ALTER TABLE t1 DROP PRIMARY KEY, ADD UNIQUE INDEX(c2), ALGORITHM = INPLACE; ALTER TABLE t1 DROP INDEX c2, ADD PRIMARY KEY(c1), ALGORITHM = INPLACE; eval $innodb_metrics_select; ---echo # session default connection default; --error ER_DUP_ENTRY INSERT INTO t1 VALUES(6,3,1); @@ -148,7 +133,6 @@ BEGIN; INSERT INTO t1 VALUES(7,4,2); ROLLBACK; ---echo # session con1 connection con1; let $ID= `SELECT @id := CONNECTION_ID()`; --error ER_QUERY_INTERRUPTED @@ -159,7 +143,6 @@ SET DEBUG_SYNC = 'row_log_table_apply2_before SIGNAL applied WAIT_FOR kill_done' --send ALTER TABLE t1 ROW_FORMAT=REDUNDANT; ---echo # session default connection default; SET DEBUG_SYNC = 'now WAIT_FOR rebuilt'; eval $innodb_metrics_select; @@ -171,13 +154,11 @@ let $ignore= `SELECT @id := $ID`; KILL QUERY @id; SET DEBUG_SYNC = 'now SIGNAL kill_done'; ---echo # session con1 connection con1; --error ER_QUERY_INTERRUPTED reap; eval $innodb_metrics_select; ---echo # session default connection default; CHECK TABLE t1; INSERT INTO t1 SELECT 5 + c1, c2, c3 FROM t1; @@ -199,7 +180,6 @@ SET @rowlog_encrypt_0= (SELECT variable_value FROM information_schema.global_status WHERE variable_name = 'innodb_encryption_n_rowlog_blocks_encrypted'); ---echo # session con1 connection con1; SHOW CREATE TABLE t1; ALTER TABLE t1 ROW_FORMAT=REDUNDANT; @@ -217,7 +197,6 @@ PAGE_COMPRESSED = YES PAGE_COMPRESSION_LEVEL = 1, ALGORITHM = INPLACE; # Generate some log (delete-mark, delete-unmark, insert etc.) # while the index creation is blocked. Some of this may run # in parallel with the clustered index scan. ---echo # session default connection default; INSERT INTO t1 SELECT 80 + c1, c2, c3 FROM t1; INSERT INTO t1 SELECT 160 + c1, c2, c3 FROM t1; @@ -261,7 +240,6 @@ SELECT # Release con1. SET DEBUG_SYNC = 'now SIGNAL dml2_done'; ---echo # session con1 connection con1; # If the following fails with the wrong error, it probably means that # you should rerun with a larger mtr --debug-sync-timeout. @@ -295,7 +273,6 @@ ALTER TABLE t1 DROP PRIMARY KEY, ADD PRIMARY KEY(c22f,c1,c4(5)), CHANGE c2 c22f INT, CHANGE c3 c3 CHAR(255) NULL, CHANGE c1 c1 INT AFTER c22f, ADD COLUMN c4 VARCHAR(6) DEFAULT 'Online', LOCK=NONE; ---echo # session default connection default; SET DEBUG_SYNC = 'now WAIT_FOR rebuilt3'; # Generate some log (delete-mark, delete-unmark, insert etc.) @@ -312,7 +289,6 @@ eval $innodb_metrics_select; # Release con1. SET DEBUG_SYNC = 'now SIGNAL dml3_done'; ---echo # session con1 connection con1; reap; eval $innodb_metrics_select; @@ -365,7 +341,6 @@ ALTER TABLE t1 MODIFY c3 CHAR(255) NOT NULL, DROP COLUMN c22f, DROP PRIMARY KEY, ADD PRIMARY KEY(c1,c4(5)), ADD COLUMN c5 CHAR(5) DEFAULT 'tired' FIRST; ---echo # session default connection default; SET DEBUG_SYNC = 'now WAIT_FOR c3p5_created0'; @@ -374,16 +349,13 @@ INSERT INTO t1 VALUES(347,33101,'Pikku kakkosen posti','YLETV2'); INSERT INTO t1 VALUES(33101,347,NULL,''); SET DEBUG_SYNC = 'now SIGNAL ins_done0'; ---echo # session con1 connection con1; --error WARN_DATA_TRUNCATED reap; ---echo # session default connection default; ROLLBACK; ---echo # session con1 connection con1; ALTER TABLE t1 MODIFY c3 CHAR(255) NOT NULL; @@ -394,7 +366,6 @@ ADD COLUMN c6 VARCHAR(1000) DEFAULT 'I love tracking down hard-to-reproduce bugs.', ADD PRIMARY KEY c3p5(c3(5), c6(2)); ---echo # session default connection default; SET DEBUG_SYNC = 'now WAIT_FOR c3p5_created'; SET DEBUG_SYNC = 'ib_after_row_insert SIGNAL ins_done WAIT_FOR ddl_timed_out'; @@ -403,33 +374,48 @@ INSERT INTO t1 VALUES(347,33101,NULL,''); --send INSERT INTO t1 VALUES(347,33101,'Pikku kakkosen posti',''); ---echo # session con1 connection con1; --error ER_LOCK_WAIT_TIMEOUT reap; SET DEBUG_SYNC = 'now SIGNAL ddl_timed_out'; eval $innodb_metrics_select; ---echo # session default connection default; reap; SELECT COUNT(*) FROM t1; ALTER TABLE t1 ROW_FORMAT=REDUNDANT; SELECT * FROM t1 LIMIT 10; ---echo # session con1 connection con1; ALTER TABLE t1 DISCARD TABLESPACE; ---echo # Disconnect session con1 -disconnect con1; ---echo # session default connection default; SHOW CREATE TABLE t1; -SET DEBUG_SYNC = 'RESET'; SET GLOBAL innodb_monitor_disable = module_ddl; DROP TABLE t1; +CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB; + +connection con1; +SET DEBUG_SYNC = 'row_log_table_apply1_before SIGNAL created WAIT_FOR ins'; +send ALTER TABLE t1 FORCE; + +connection default; +SET DEBUG_SYNC = 'now WAIT_FOR created'; +BEGIN; +INSERT INTO t1 VALUES(1); +ROLLBACK; +SET DEBUG_SYNC = 'now SIGNAL ins'; + +connection con1; +reap; +disconnect con1; + +connection default; +SELECT * FROM t1; +DROP TABLE t1; +SET DEBUG_SYNC = 'RESET'; + # 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 diff --git a/mysql-test/suite/innodb/t/innodb_trx_weight.test b/mysql-test/suite/innodb/t/innodb_trx_weight.test index 8dc23e99585..e33885dac8b 100644 --- a/mysql-test/suite/innodb/t/innodb_trx_weight.test +++ b/mysql-test/suite/innodb/t/innodb_trx_weight.test @@ -78,7 +78,7 @@ INSERT INTO t3 SELECT * FROM t3; -- let $con1_extra_sql_present = 1 -- let $con2_extra_sql = SELECT * FROM t3 FOR UPDATE -- let $con2_extra_sql_present = 1 --- let $con1_should_be_rolledback = 0 +-- let $con1_should_be_rolledback = 1 -- source include/innodb_trx_weight.inc # test weight when non-transactional tables are edited diff --git a/mysql-test/suite/innodb/t/lock_insert_into_empty.test b/mysql-test/suite/innodb/t/lock_insert_into_empty.test new file mode 100644 index 00000000000..c6a53db79cb --- /dev/null +++ b/mysql-test/suite/innodb/t/lock_insert_into_empty.test @@ -0,0 +1,26 @@ +--source include/have_innodb.inc + +CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB; +CREATE TABLE t2 (a INT PRIMARY KEY) ENGINE=InnoDB; + +INSERT INTO t1 VALUES(0); +BEGIN; +DELETE FROM t1; +--error ER_DUP_ENTRY +INSERT INTO t2 VALUES(1),(1); + +connect (con1,localhost,root,,); +BEGIN; +SELECT * FROM t2 LOCK IN SHARE MODE; + +connection default; +SET innodb_lock_wait_timeout=1; +--error ER_LOCK_WAIT_TIMEOUT +INSERT INTO t2 VALUES(2); +disconnect con1; +INSERT INTO t2 VALUES(3); +COMMIT; + +SELECT * FROM t1; +SELECT * FROM t2; +DROP TABLE t1, t2; diff --git a/mysql-test/suite/innodb_fts/r/innodb_fts_plugin.result b/mysql-test/suite/innodb_fts/r/innodb_fts_plugin.result index ec417af97c5..b1426ece222 100644 --- a/mysql-test/suite/innodb_fts/r/innodb_fts_plugin.result +++ b/mysql-test/suite/innodb_fts/r/innodb_fts_plugin.result @@ -139,25 +139,25 @@ INSERT INTO articles (title, body) VALUES SELECT * FROM articles WHERE MATCH(title, body) AGAINST('MySQL'); id title body -6 MySQL Tutorial DBMS stands for MySQL DataBase ... -7 How To Use MySQL Well After you went through a ... -8 Optimizing MySQL In this tutorial we will show ... -9 1001 MySQL Tricks How to use full-text search engine +1 MySQL Tutorial DBMS stands for MySQL DataBase ... +2 How To Use MySQL Well After you went through a ... +3 Optimizing MySQL In this tutorial we will show ... +4 1001 MySQL Tricks How to use full-text search engine SELECT * FROM articles WHERE MATCH(title, body) AGAINST('tutorial'); id title body -6 MySQL Tutorial DBMS stands for MySQL DataBase ... -8 Optimizing MySQL In this tutorial we will show ... +1 MySQL Tutorial DBMS stands for MySQL DataBase ... +3 Optimizing MySQL In this tutorial we will show ... SELECT * FROM articles WHERE MATCH(title, body) AGAINST('Tricks'); id title body -9 1001 MySQL Tricks How to use full-text search engine -10 Go MariaDB Tricks How to use full text search engine +4 1001 MySQL Tricks How to use full-text search engine +5 Go MariaDB Tricks How to use full text search engine SELECT * FROM articles WHERE MATCH(title, body) AGAINST('full text search'); id title body -10 Go MariaDB Tricks How to use full text search engine -9 1001 MySQL Tricks How to use full-text search engine +5 Go MariaDB Tricks How to use full text search engine +4 1001 MySQL Tricks How to use full-text search engine SELECT COUNT(*) FROM articles; COUNT(*) 5 diff --git a/mysql-test/suite/innodb_gis/r/rtree_concurrent_srch.result b/mysql-test/suite/innodb_gis/r/rtree_concurrent_srch.result index f5a337ecd03..81b82691876 100644 --- a/mysql-test/suite/innodb_gis/r/rtree_concurrent_srch.result +++ b/mysql-test/suite/innodb_gis/r/rtree_concurrent_srch.result @@ -328,6 +328,7 @@ connection default; DROP TABLE t1; SET DEBUG_SYNC = 'RESET'; create table t1 (c1 int, c2 geometry not null, spatial index (c2))engine=innodb; +insert into t1 values(100, point(100, 100)); create procedure insert_t1(IN total int) begin declare i int default 1; @@ -348,7 +349,7 @@ rollback; SET DEBUG_SYNC= 'now SIGNAL sigb'; connection a; count(*) -0 +1 connection default; drop procedure insert_t1; DROP TABLE t1; diff --git a/mysql-test/suite/innodb_gis/t/rtree_concurrent_srch.test b/mysql-test/suite/innodb_gis/t/rtree_concurrent_srch.test index 43119415d47..c4a6448f387 100644 --- a/mysql-test/suite/innodb_gis/t/rtree_concurrent_srch.test +++ b/mysql-test/suite/innodb_gis/t/rtree_concurrent_srch.test @@ -388,6 +388,7 @@ DROP TABLE t1; SET DEBUG_SYNC = 'RESET'; create table t1 (c1 int, c2 geometry not null, spatial index (c2))engine=innodb; +insert into t1 values(100, point(100, 100)); delimiter |; create procedure insert_t1(IN total int) diff --git a/mysql-test/suite/mariabackup/incremental_backup.result b/mysql-test/suite/mariabackup/incremental_backup.result index d6a78655a0c..ed67ceee8e2 100644 --- a/mysql-test/suite/mariabackup/incremental_backup.result +++ b/mysql-test/suite/mariabackup/incremental_backup.result @@ -1,6 +1,7 @@ call mtr.add_suppression("InnoDB: New log files created"); CREATE TABLE t_aria(i INT) ENGINE ARIA; CREATE TABLE t(i INT PRIMARY KEY) ENGINE INNODB; +INSERT INTO t VALUES(100); BEGIN; INSERT INTO t VALUES(2); connect con1,localhost,root,,; @@ -17,6 +18,7 @@ SELECT * FROM t; i 1 2 +100 # Prepare full backup, apply incremental one # Aria log file was updated during applying incremental backup disconnect con1; @@ -29,5 +31,6 @@ SELECT * FROM t; i 1 2 +100 DROP TABLE t; DROP TABLE t_aria; diff --git a/mysql-test/suite/mariabackup/incremental_backup.test b/mysql-test/suite/mariabackup/incremental_backup.test index 88e277fd95a..62cdf9e6cb3 100644 --- a/mysql-test/suite/mariabackup/incremental_backup.test +++ b/mysql-test/suite/mariabackup/incremental_backup.test @@ -13,6 +13,9 @@ let incremental_dir=$MYSQLTEST_VARDIR/tmp/backup_inc1; CREATE TABLE t_aria(i INT) ENGINE ARIA; CREATE TABLE t(i INT PRIMARY KEY) ENGINE INNODB; +# MDEV-515 takes X-lock on the table for the first insert. +# So concurrent insert won't happen on the table +INSERT INTO t VALUES(100); BEGIN; INSERT INTO t VALUES(2); connect (con1,localhost,root,,); diff --git a/mysql-test/suite/parts/inc/partition_auto_increment.inc b/mysql-test/suite/parts/inc/partition_auto_increment.inc index 4392d04db8a..3721caeb465 100644 --- a/mysql-test/suite/parts/inc/partition_auto_increment.inc +++ b/mysql-test/suite/parts/inc/partition_auto_increment.inc @@ -393,6 +393,12 @@ connect(con1, localhost, root,,); connection default; eval CREATE TABLE t1 (c1 INT NOT NULL AUTO_INCREMENT, PRIMARY KEY (c1)) ENGINE = $engine; +if ($engine == "'InnoDB'") +{ +# MDEV-515 takes X-lock on the table for the first insert. +# So concurrent insert won't happen on the table +INSERT INTO t1(c1) VALUES(100); +} START TRANSACTION; INSERT INTO t1 (c1) VALUES (2); INSERT INTO t1 (c1) VALUES (4); @@ -434,6 +440,13 @@ eval CREATE TABLE t1 (c1 INT NOT NULL AUTO_INCREMENT, PRIMARY KEY (c1)) ENGINE = $engine PARTITION BY HASH(c1) PARTITIONS 2; +IF ($engine == "'InnoDB'") +{ +# MDEV-515 takes X-lock on the table for the first insert. +# So concurrent insert won't happen on the table +INSERT INTO t1 (c1) VALUES (100); +INSERT INTO t1 (c1) VALUES (101); +} START TRANSACTION; INSERT INTO t1 (c1) VALUES (2); INSERT INTO t1 (c1) VALUES (4); diff --git a/mysql-test/suite/parts/r/partition_auto_increment_innodb.result b/mysql-test/suite/parts/r/partition_auto_increment_innodb.result index 76f1ddfceae..7b25d4858ff 100644 --- a/mysql-test/suite/parts/r/partition_auto_increment_innodb.result +++ b/mysql-test/suite/parts/r/partition_auto_increment_innodb.result @@ -490,6 +490,7 @@ connect con1, localhost, root,,; connection default; CREATE TABLE t1 (c1 INT NOT NULL AUTO_INCREMENT, PRIMARY KEY (c1)) ENGINE = 'InnoDB'; +INSERT INTO t1(c1) VALUES(100); START TRANSACTION; INSERT INTO t1 (c1) VALUES (2); INSERT INTO t1 (c1) VALUES (4); @@ -510,17 +511,19 @@ connection con1; INSERT INTO t1 (c1) VALUES (NULL); SELECT * FROM t1 ORDER BY c1; c1 -5 10 -22 -23 +100 +101 +104 +105 COMMIT; SELECT * FROM t1 ORDER BY c1; c1 -5 10 -22 -23 +100 +101 +104 +105 disconnect con1; connection default; INSERT INTO t1 (c1) VALUES (NULL); @@ -528,31 +531,33 @@ SELECT * FROM t1 ORDER BY c1; c1 2 4 -5 10 -11 -12 16 19 21 -22 -23 -24 +100 +101 +102 +103 +104 +105 +106 COMMIT; SELECT * FROM t1 ORDER BY c1; c1 2 4 -5 10 -11 -12 16 19 21 -22 -23 -24 +100 +101 +102 +103 +104 +105 +106 DROP TABLE t1; # Test with two threads + start transaction connect con1, localhost, root,,; @@ -561,6 +566,8 @@ CREATE TABLE t1 (c1 INT NOT NULL AUTO_INCREMENT, PRIMARY KEY (c1)) ENGINE = 'InnoDB' PARTITION BY HASH(c1) PARTITIONS 2; +INSERT INTO t1 (c1) VALUES (100); +INSERT INTO t1 (c1) VALUES (101); START TRANSACTION; INSERT INTO t1 (c1) VALUES (2); INSERT INTO t1 (c1) VALUES (4); @@ -578,17 +585,21 @@ connection con1; INSERT INTO t1 (c1) VALUES (NULL); SELECT * FROM t1 ORDER BY c1; c1 -5 10 -22 -23 +100 +101 +102 +105 +106 COMMIT; SELECT * FROM t1 ORDER BY c1; c1 -5 10 -22 -23 +100 +101 +102 +105 +106 disconnect con1; connection default; INSERT INTO t1 (c1) VALUES (NULL); @@ -596,31 +607,35 @@ SELECT * FROM t1 ORDER BY c1; c1 2 4 -5 10 -11 -12 16 19 21 -22 -23 -24 +100 +101 +102 +103 +104 +105 +106 +107 COMMIT; SELECT * FROM t1 ORDER BY c1; c1 2 4 -5 10 -11 -12 16 19 21 -22 -23 -24 +100 +101 +102 +103 +104 +105 +106 +107 DROP TABLE t1; # Test with another column after CREATE TABLE t1 ( diff --git a/mysql-test/suite/rpl/include/rpl_parallel_gco_wait_kill.inc b/mysql-test/suite/rpl/include/rpl_parallel_gco_wait_kill.inc index d918b2ea692..415960e563e 100644 --- a/mysql-test/suite/rpl/include/rpl_parallel_gco_wait_kill.inc +++ b/mysql-test/suite/rpl/include/rpl_parallel_gco_wait_kill.inc @@ -26,6 +26,10 @@ CHANGE MASTER TO master_use_gtid=slave_pos; --connect (con_temp5,127.0.0.1,root,,test,$SERVER_MYPORT_1,) ALTER TABLE mysql.gtid_slave_pos ENGINE=InnoDB; CREATE TABLE t3 (a INT PRIMARY KEY, b INT) ENGINE=InnoDB; +# MDEV-515 takes X-lock on the table for the first insert. +# So concurrent insert won't happen on the table +INSERT INTO t3 VALUES(100, 100); + --save_master_pos --connection server_2 diff --git a/mysql-test/suite/rpl/include/rpl_parallel_ignored_errors.inc b/mysql-test/suite/rpl/include/rpl_parallel_ignored_errors.inc index 7a6a758a508..493385f1ae3 100644 --- a/mysql-test/suite/rpl/include/rpl_parallel_ignored_errors.inc +++ b/mysql-test/suite/rpl/include/rpl_parallel_ignored_errors.inc @@ -57,6 +57,9 @@ CALL mtr.add_suppression("Commit failed due to failure of an earlier commit on w --connection server_1 ALTER TABLE mysql.gtid_slave_pos ENGINE=InnoDB; CREATE TABLE t1 (a int PRIMARY KEY) ENGINE=InnoDB; +# MDEV-515 takes X-lock on the table for the first insert. +# So concurrent insert won't happen on the table +INSERT INTO t1 VALUES(1); --source include/save_master_gtid.inc --connection server_2 diff --git a/mysql-test/suite/rpl/include/rpl_parallel_slave_bgc_kill.inc b/mysql-test/suite/rpl/include/rpl_parallel_slave_bgc_kill.inc index a78dbad052f..efb998b0443 100644 --- a/mysql-test/suite/rpl/include/rpl_parallel_slave_bgc_kill.inc +++ b/mysql-test/suite/rpl/include/rpl_parallel_slave_bgc_kill.inc @@ -25,6 +25,10 @@ ALTER TABLE mysql.gtid_slave_pos ENGINE=InnoDB; CREATE TABLE t1 (a int PRIMARY KEY) ENGINE=MyISAM; CREATE TABLE t2 (a int PRIMARY KEY) ENGINE=InnoDB; CREATE TABLE t3 (a INT PRIMARY KEY, b INT) ENGINE=InnoDB; +# MDEV-515 takes X-lock on the table for the first insert. +# So concurrent insert won't happen on the table +INSERT INTO t2 VALUES(100); +INSERT INTO t3 VALUES(100, 100); --save_master_pos --connection server_2 diff --git a/mysql-test/suite/rpl/include/rpl_parallel_stop_slave.inc b/mysql-test/suite/rpl/include/rpl_parallel_stop_slave.inc index 4eeddc927e0..35879e98e66 100644 --- a/mysql-test/suite/rpl/include/rpl_parallel_stop_slave.inc +++ b/mysql-test/suite/rpl/include/rpl_parallel_stop_slave.inc @@ -23,6 +23,10 @@ ALTER TABLE mysql.gtid_slave_pos ENGINE=InnoDB; CREATE TABLE t1 (a int PRIMARY KEY) ENGINE=MyISAM; CREATE TABLE t2 (a int PRIMARY KEY) ENGINE=InnoDB; CREATE TABLE t3 (a INT PRIMARY KEY, b INT) ENGINE=InnoDB; +# MDEV-515 takes X-lock on the table for the first insert. +# So concurrent insert won't happen on the table +INSERT INTO t2 VALUES(100); +INSERT INTO t3 VALUES(100, 100); --save_master_pos --connection server_2 diff --git a/mysql-test/suite/rpl/r/parallel_backup.result b/mysql-test/suite/rpl/r/parallel_backup.result index d87c61f2d0f..9d394a220d5 100644 --- a/mysql-test/suite/rpl/r/parallel_backup.result +++ b/mysql-test/suite/rpl/r/parallel_backup.result @@ -6,6 +6,7 @@ include/master-slave.inc # connection master; CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE = innodb; +INSERT INTO t1 VALUES(100); connection slave; include/stop_slave.inc SET @old_parallel_threads= @@GLOBAL.slave_parallel_threads; diff --git a/mysql-test/suite/rpl/r/rpl_circular_for_4_hosts.result b/mysql-test/suite/rpl/r/rpl_circular_for_4_hosts.result index f50f6993bdf..4ec1e2512d2 100644 --- a/mysql-test/suite/rpl/r/rpl_circular_for_4_hosts.result +++ b/mysql-test/suite/rpl/r/rpl_circular_for_4_hosts.result @@ -17,6 +17,7 @@ SET auto_increment_offset= 1; connection server_1; CREATE TABLE t1 (a INT NOT NULL AUTO_INCREMENT, b VARCHAR(100), c INT NOT NULL, PRIMARY KEY(a)) ENGINE=MyISAM; CREATE TABLE t2 (a INT NOT NULL AUTO_INCREMENT, b VARCHAR(100), c INT NOT NULL, PRIMARY KEY(a)) ENGINE=InnoDB; +INSERT INTO t2 (b,c) VALUES('MDEV-515', 100); include/rpl_sync.inc connection server_4; call mtr.add_suppression("Slave SQL.*Request to stop slave SQL Thread received while applying a group that has non-transactional changes; waiting for completion of the group"); diff --git a/mysql-test/suite/rpl/r/rpl_mariadb_slave_capability.result b/mysql-test/suite/rpl/r/rpl_mariadb_slave_capability.result index d384422f88a..ac846ac6c00 100644 --- a/mysql-test/suite/rpl/r/rpl_mariadb_slave_capability.result +++ b/mysql-test/suite/rpl/r/rpl_mariadb_slave_capability.result @@ -78,6 +78,7 @@ slave-relay-bin.000007 # Query # # COMMIT *** MDEV-5754: MySQL 5.5 slaves cannot replicate from MariaDB 10.0 *** connection master; CREATE TABLE t2 (a INT PRIMARY KEY) ENGINE=InnoDB; +INSERT INTO t2 VALUES(100); connect con1,127.0.0.1,root,,test,$SERVER_MYPORT_1,; SET debug_sync='commit_after_release_LOCK_prepare_ordered SIGNAL master_queued1 WAIT_FOR master_cont1'; INSERT INTO t2 VALUES (1); @@ -112,6 +113,7 @@ SELECT * FROM t2 ORDER BY a; a 1 2 +100 # Test that slave which cannot tolerate holes in binlog stream but # knows the event does not get dummy event include/stop_slave.inc diff --git a/mysql-test/suite/rpl/r/rpl_parallel_gco_wait_kill.result b/mysql-test/suite/rpl/r/rpl_parallel_gco_wait_kill.result index 4472550c4f2..f12d19442f1 100644 --- a/mysql-test/suite/rpl/r/rpl_parallel_gco_wait_kill.result +++ b/mysql-test/suite/rpl/r/rpl_parallel_gco_wait_kill.result @@ -20,6 +20,7 @@ connect con_temp4,127.0.0.1,root,,test,$SERVER_MYPORT_1,; connect con_temp5,127.0.0.1,root,,test,$SERVER_MYPORT_1,; ALTER TABLE mysql.gtid_slave_pos ENGINE=InnoDB; CREATE TABLE t3 (a INT PRIMARY KEY, b INT) ENGINE=InnoDB; +INSERT INTO t3 VALUES(100, 100); connection server_2; connection server_1; SET sql_log_bin=0; @@ -136,6 +137,7 @@ a b 68 68 69 69 70 70 +100 100 SET debug_sync='RESET'; connection server_2; SET debug_sync='now SIGNAL d0_cont'; @@ -161,6 +163,7 @@ a b 68 68 69 69 70 70 +100 100 SET debug_sync='RESET'; SET GLOBAL slave_parallel_threads=0; SET GLOBAL slave_parallel_threads=10; @@ -190,6 +193,7 @@ a b 68 68 69 69 70 70 +100 100 SET sql_log_bin=0; DROP FUNCTION foo; CREATE FUNCTION foo(x INT, d1 VARCHAR(500), d2 VARCHAR(500)) @@ -225,6 +229,7 @@ SELECT * FROM t3 WHERE a >= 80 ORDER BY a; a b 80 0 81 10000 +100 100 connection server_2; SET debug_sync='now WAIT_FOR wait_queue_ready'; KILL THD_ID; @@ -244,6 +249,7 @@ a b 80 0 81 10000 82 0 +100 100 connection server_2; include/stop_slave.inc SET GLOBAL slave_parallel_mode=@old_parallel_mode; diff --git a/mysql-test/suite/rpl/r/rpl_parallel_ignored_errors.result b/mysql-test/suite/rpl/r/rpl_parallel_ignored_errors.result index 3dd5a3ea83c..ce11b814d44 100644 --- a/mysql-test/suite/rpl/r/rpl_parallel_ignored_errors.result +++ b/mysql-test/suite/rpl/r/rpl_parallel_ignored_errors.result @@ -13,6 +13,7 @@ include/start_slave.inc connection server_1; ALTER TABLE mysql.gtid_slave_pos ENGINE=InnoDB; CREATE TABLE t1 (a int PRIMARY KEY) ENGINE=InnoDB; +INSERT INTO t1 VALUES(1); include/save_master_gtid.inc connection server_2; include/sync_with_master_gtid.inc diff --git a/mysql-test/suite/rpl/r/rpl_parallel_no_log_slave_updates.result b/mysql-test/suite/rpl/r/rpl_parallel_no_log_slave_updates.result index e966023c30f..6e324be9ebb 100644 --- a/mysql-test/suite/rpl/r/rpl_parallel_no_log_slave_updates.result +++ b/mysql-test/suite/rpl/r/rpl_parallel_no_log_slave_updates.result @@ -35,6 +35,7 @@ SET sql_log_bin=1; connect con_temp3,127.0.0.1,root,,test,$SERVER_MYPORT_1,; SET debug_sync='commit_after_release_LOCK_prepare_ordered SIGNAL master_queued1 WAIT_FOR master_cont1'; SET binlog_format=statement; +SET debug_dbug='+d,row_ins_row_level'; INSERT INTO t3 VALUES (31, foo(31, 'ha_commit_one_phase WAIT_FOR t2_waiting', 'commit_one_phase_2 SIGNAL t1_ready WAIT_FOR t1_cont')); @@ -43,6 +44,7 @@ SET debug_sync='now WAIT_FOR master_queued1'; connect con_temp4,127.0.0.1,root,,test,$SERVER_MYPORT_1,; SET debug_sync='commit_after_release_LOCK_prepare_ordered SIGNAL master_queued2'; SET binlog_format=statement; +SET debug_dbug='+d,row_ins_row_level'; BEGIN; INSERT INTO t3 VALUES (32, foo(32, 'ha_write_row_end SIGNAL t2_query WAIT_FOR t2_cont', @@ -56,6 +58,7 @@ SET debug_sync='now WAIT_FOR master_queued2'; connect con_temp5,127.0.0.1,root,,test,$SERVER_MYPORT_1,; SET debug_sync='commit_after_release_LOCK_prepare_ordered SIGNAL master_queued3'; SET binlog_format=statement; +SET debug_dbug='+d,row_ins_row_level'; INSERT INTO t3 VALUES (34, foo(34, '', '')); diff --git a/mysql-test/suite/rpl/r/rpl_parallel_retry.result b/mysql-test/suite/rpl/r/rpl_parallel_retry.result index b43556815d1..381fec649ff 100644 --- a/mysql-test/suite/rpl/r/rpl_parallel_retry.result +++ b/mysql-test/suite/rpl/r/rpl_parallel_retry.result @@ -259,6 +259,7 @@ connection server_1; CREATE TABLE t3 (a INT PRIMARY KEY, b INT, KEY b_idx(b)) ENGINE=InnoDB; INSERT INTO t3 VALUES (1,NULL), (2,2), (3,NULL), (4,4), (5, NULL), (6, 6); CREATE TABLE t4 (a INT PRIMARY KEY, b INT) ENGINE=InnoDB; +INSERT INTO t4 VALUES(100, 100); SET @old_format= @@SESSION.binlog_format; SET binlog_format='statement'; connection server_2; @@ -344,6 +345,7 @@ DROP function foo; connection server_2; connection server_1; CREATE TABLE t1 (a int PRIMARY KEY, b INT) ENGINE=InnoDB; +INSERT INTO t1 VALUES(100, 100); connection server_2; include/stop_slave.inc SET @old_parallel_threads=@@GLOBAL.slave_parallel_threads; diff --git a/mysql-test/suite/rpl/r/rpl_parallel_slave_bgc_kill.result b/mysql-test/suite/rpl/r/rpl_parallel_slave_bgc_kill.result index 320bf0e49f8..ba131ea094f 100644 --- a/mysql-test/suite/rpl/r/rpl_parallel_slave_bgc_kill.result +++ b/mysql-test/suite/rpl/r/rpl_parallel_slave_bgc_kill.result @@ -17,6 +17,8 @@ ALTER TABLE mysql.gtid_slave_pos ENGINE=InnoDB; CREATE TABLE t1 (a int PRIMARY KEY) ENGINE=MyISAM; CREATE TABLE t2 (a int PRIMARY KEY) ENGINE=InnoDB; CREATE TABLE t3 (a INT PRIMARY KEY, b INT) ENGINE=InnoDB; +INSERT INTO t2 VALUES(100); +INSERT INTO t3 VALUES(100, 100); connection server_2; connection server_1; SET sql_log_bin=0; @@ -80,6 +82,7 @@ a b 32 32 33 33 34 34 +100 100 SET debug_sync='RESET'; connection server_2; SET sql_log_bin=0; @@ -98,6 +101,7 @@ STOP SLAVE IO_THREAD; SELECT * FROM t3 WHERE a >= 30 ORDER BY a; a b 31 31 +100 100 SET debug_sync='RESET'; SET GLOBAL slave_parallel_threads=0; SET GLOBAL slave_parallel_threads=10; @@ -121,6 +125,7 @@ a b 33 33 34 34 39 0 +100 100 SET sql_log_bin=0; DROP FUNCTION foo; CREATE FUNCTION foo(x INT, d1 VARCHAR(500), d2 VARCHAR(500)) @@ -179,6 +184,7 @@ a b 42 42 43 43 44 44 +100 100 SET debug_sync='RESET'; connection server_2; SET debug_sync='now WAIT_FOR t2_query'; @@ -211,6 +217,7 @@ a b 43 43 44 44 49 0 +100 100 SET sql_log_bin=0; DROP FUNCTION foo; CREATE FUNCTION foo(x INT, d1 VARCHAR(500), d2 VARCHAR(500)) @@ -274,6 +281,7 @@ a b 52 52 53 53 54 54 +100 100 SET debug_sync='RESET'; connection server_2; SET debug_sync='now WAIT_FOR t2_query'; @@ -286,6 +294,7 @@ include/wait_for_slave_sql_error.inc [errno=1317,1927,1964] SELECT * FROM t3 WHERE a >= 50 ORDER BY a; a b 51 51 +100 100 SET debug_sync='RESET'; SET GLOBAL slave_parallel_threads=0; SET GLOBAL slave_parallel_threads=10; @@ -309,6 +318,7 @@ a b 53 53 54 54 59 0 +100 100 connection server_2; include/stop_slave.inc CHANGE MASTER TO master_use_gtid=slave_pos; diff --git a/mysql-test/suite/rpl/r/rpl_parallel_stop_slave.result b/mysql-test/suite/rpl/r/rpl_parallel_stop_slave.result index 6c9fd168e73..0c810d2a3f4 100644 --- a/mysql-test/suite/rpl/r/rpl_parallel_stop_slave.result +++ b/mysql-test/suite/rpl/r/rpl_parallel_stop_slave.result @@ -16,6 +16,8 @@ ALTER TABLE mysql.gtid_slave_pos ENGINE=InnoDB; CREATE TABLE t1 (a int PRIMARY KEY) ENGINE=MyISAM; CREATE TABLE t2 (a int PRIMARY KEY) ENGINE=InnoDB; CREATE TABLE t3 (a INT PRIMARY KEY, b INT) ENGINE=InnoDB; +INSERT INTO t2 VALUES(100); +INSERT INTO t3 VALUES(100, 100); connection server_2; include/stop_slave.inc connection server_1; @@ -55,9 +57,11 @@ SELECT * FROM t2 WHERE a >= 20 ORDER BY a; a 20 21 +100 SELECT * FROM t3 WHERE a >= 20 ORDER BY a; a b 20 20 +100 100 include/start_slave.inc SELECT * FROM t1 WHERE a >= 20 ORDER BY a; a @@ -66,11 +70,13 @@ SELECT * FROM t2 WHERE a >= 20 ORDER BY a; a 20 21 +100 SELECT * FROM t3 WHERE a >= 20 ORDER BY a; a b 20 20 21 21 22 22 +100 100 connection server_2; include/stop_slave.inc SET GLOBAL slave_parallel_mode=@old_parallel_mode; diff --git a/mysql-test/suite/rpl/r/rpl_semisync_ali_issues.result b/mysql-test/suite/rpl/r/rpl_semisync_ali_issues.result index 9607e8a7998..36a2bac5838 100644 --- a/mysql-test/suite/rpl/r/rpl_semisync_ali_issues.result +++ b/mysql-test/suite/rpl/r/rpl_semisync_ali_issues.result @@ -74,6 +74,7 @@ select * from t1; a 1 truncate table t1; +INSERT INTO t1 VALUES (100); connection slave; connection con1; SET DEBUG_SYNC= 'reset'; @@ -107,6 +108,7 @@ SET DEBUG_SYNC= "now WAIT_FOR after_commit_done"; connection slave; select * from t1; a +100 1 2 3 @@ -114,6 +116,7 @@ a connection con2; select * from t1; a +100 1 2 3 @@ -123,6 +126,7 @@ connection con1; connection con1; select * from t1; a +100 1 2 3 diff --git a/mysql-test/suite/rpl/r/rpl_xa_survive_disconnect.result b/mysql-test/suite/rpl/r/rpl_xa_survive_disconnect.result index 0ee7b497077..3ab263b7f35 100644 --- a/mysql-test/suite/rpl/r/rpl_xa_survive_disconnect.result +++ b/mysql-test/suite/rpl/r/rpl_xa_survive_disconnect.result @@ -7,6 +7,7 @@ CREATE DATABASE d1; CREATE DATABASE d2; CREATE TABLE d1.t (a INT) ENGINE=innodb; CREATE TABLE d2.t (a INT) ENGINE=innodb; +INSERT INTO d1.t VALUES(100); connect master_conn1, 127.0.0.1,root,,test,$MASTER_MYPORT,; SET @@session.binlog_format= statement; XA START '1-stmt'; @@ -45,6 +46,9 @@ master-bin.000001 # Gtid # # GTID #-#-# master-bin.000001 # Query # # use `test`; CREATE TABLE d1.t (a INT) ENGINE=innodb master-bin.000001 # Gtid # # GTID #-#-# master-bin.000001 # Query # # use `test`; CREATE TABLE d2.t (a INT) ENGINE=innodb +master-bin.000001 # Gtid # # BEGIN GTID #-#-# +master-bin.000001 # Query # # use `test`; INSERT INTO d1.t VALUES(100) +master-bin.000001 # Xid # # COMMIT /* XID */ master-bin.000001 # Gtid # # XA START X'312d73746d74',X'',1 GTID #-#-# master-bin.000001 # Query # # use `test`; INSERT INTO d1.t VALUES (1) master-bin.000001 # Query # # XA END X'312d73746d74',X'',1 @@ -90,6 +94,7 @@ connection master2; XA START '4'; SELECT * FROM d1.t; a +100 1 2 XA END '4'; diff --git a/mysql-test/suite/rpl/r/rpl_xa_survive_disconnect_lsu_off.result b/mysql-test/suite/rpl/r/rpl_xa_survive_disconnect_lsu_off.result index 0ee7b497077..3ab263b7f35 100644 --- a/mysql-test/suite/rpl/r/rpl_xa_survive_disconnect_lsu_off.result +++ b/mysql-test/suite/rpl/r/rpl_xa_survive_disconnect_lsu_off.result @@ -7,6 +7,7 @@ CREATE DATABASE d1; CREATE DATABASE d2; CREATE TABLE d1.t (a INT) ENGINE=innodb; CREATE TABLE d2.t (a INT) ENGINE=innodb; +INSERT INTO d1.t VALUES(100); connect master_conn1, 127.0.0.1,root,,test,$MASTER_MYPORT,; SET @@session.binlog_format= statement; XA START '1-stmt'; @@ -45,6 +46,9 @@ master-bin.000001 # Gtid # # GTID #-#-# master-bin.000001 # Query # # use `test`; CREATE TABLE d1.t (a INT) ENGINE=innodb master-bin.000001 # Gtid # # GTID #-#-# master-bin.000001 # Query # # use `test`; CREATE TABLE d2.t (a INT) ENGINE=innodb +master-bin.000001 # Gtid # # BEGIN GTID #-#-# +master-bin.000001 # Query # # use `test`; INSERT INTO d1.t VALUES(100) +master-bin.000001 # Xid # # COMMIT /* XID */ master-bin.000001 # Gtid # # XA START X'312d73746d74',X'',1 GTID #-#-# master-bin.000001 # Query # # use `test`; INSERT INTO d1.t VALUES (1) master-bin.000001 # Query # # XA END X'312d73746d74',X'',1 @@ -90,6 +94,7 @@ connection master2; XA START '4'; SELECT * FROM d1.t; a +100 1 2 XA END '4'; diff --git a/mysql-test/suite/rpl/t/parallel_backup.test b/mysql-test/suite/rpl/t/parallel_backup.test index 6ed182c024b..964e2a30309 100644 --- a/mysql-test/suite/rpl/t/parallel_backup.test +++ b/mysql-test/suite/rpl/t/parallel_backup.test @@ -10,6 +10,9 @@ --connection master CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE = innodb; +# MDEV-515 takes X-lock on the table for the first insert. +# So concurrent insert won't happen on the table +INSERT INTO t1 VALUES(100); --sync_slave_with_master --source include/stop_slave.inc diff --git a/mysql-test/suite/rpl/t/rpl_circular_for_4_hosts.test b/mysql-test/suite/rpl/t/rpl_circular_for_4_hosts.test index 8d610a87b89..aeb849b893e 100644 --- a/mysql-test/suite/rpl/t/rpl_circular_for_4_hosts.test +++ b/mysql-test/suite/rpl/t/rpl_circular_for_4_hosts.test @@ -39,6 +39,9 @@ while ($_rpl_server) --connection server_1 CREATE TABLE t1 (a INT NOT NULL AUTO_INCREMENT, b VARCHAR(100), c INT NOT NULL, PRIMARY KEY(a)) ENGINE=MyISAM; CREATE TABLE t2 (a INT NOT NULL AUTO_INCREMENT, b VARCHAR(100), c INT NOT NULL, PRIMARY KEY(a)) ENGINE=InnoDB; +# MDEV-515 takes X-lock on the table. So it won't allow +# concurrent DML to happen at the same time +INSERT INTO t2 (b,c) VALUES('MDEV-515', 100); --source include/rpl_sync.inc --connection server_4 call mtr.add_suppression("Slave SQL.*Request to stop slave SQL Thread received while applying a group that has non-transactional changes; waiting for completion of the group"); diff --git a/mysql-test/suite/rpl/t/rpl_mariadb_slave_capability.test b/mysql-test/suite/rpl/t/rpl_mariadb_slave_capability.test index 046a65f77db..19f2db32cb7 100644 --- a/mysql-test/suite/rpl/t/rpl_mariadb_slave_capability.test +++ b/mysql-test/suite/rpl/t/rpl_mariadb_slave_capability.test @@ -84,6 +84,9 @@ let $binlog_limit=7,5; --connection master CREATE TABLE t2 (a INT PRIMARY KEY) ENGINE=InnoDB; +# MDEV-515 takes X-lock on the table for the first insert. +# So concurrent insert won't happen on the table +INSERT INTO t2 VALUES(100); let $binlog_file= query_get_value(SHOW MASTER STATUS, File, 1); let $binlog_start= query_get_value(SHOW MASTER STATUS, Position, 1); diff --git a/mysql-test/suite/rpl/t/rpl_parallel_no_log_slave_updates.test b/mysql-test/suite/rpl/t/rpl_parallel_no_log_slave_updates.test index 75db619d225..2e4c57953fe 100644 --- a/mysql-test/suite/rpl/t/rpl_parallel_no_log_slave_updates.test +++ b/mysql-test/suite/rpl/t/rpl_parallel_no_log_slave_updates.test @@ -57,6 +57,8 @@ SET sql_log_bin=1; --connect (con_temp3,127.0.0.1,root,,test,$SERVER_MYPORT_1,) SET debug_sync='commit_after_release_LOCK_prepare_ordered SIGNAL master_queued1 WAIT_FOR master_cont1'; SET binlog_format=statement; + +SET debug_dbug='+d,row_ins_row_level'; send INSERT INTO t3 VALUES (31, foo(31, 'ha_commit_one_phase WAIT_FOR t2_waiting', 'commit_one_phase_2 SIGNAL t1_ready WAIT_FOR t1_cont')); @@ -67,6 +69,7 @@ SET debug_sync='now WAIT_FOR master_queued1'; --connect (con_temp4,127.0.0.1,root,,test,$SERVER_MYPORT_1,) SET debug_sync='commit_after_release_LOCK_prepare_ordered SIGNAL master_queued2'; SET binlog_format=statement; +SET debug_dbug='+d,row_ins_row_level'; BEGIN; # This insert is just so we can get T2 to wait while a query is running that we # can see in SHOW PROCESSLIST so we can get its thread_id to kill later. @@ -86,6 +89,7 @@ SET debug_sync='now WAIT_FOR master_queued2'; --connect (con_temp5,127.0.0.1,root,,test,$SERVER_MYPORT_1,) SET debug_sync='commit_after_release_LOCK_prepare_ordered SIGNAL master_queued3'; SET binlog_format=statement; +SET debug_dbug='+d,row_ins_row_level'; send INSERT INTO t3 VALUES (34, foo(34, '', '')); diff --git a/mysql-test/suite/rpl/t/rpl_parallel_retry.test b/mysql-test/suite/rpl/t/rpl_parallel_retry.test index 97a3a709eb5..0449995621a 100644 --- a/mysql-test/suite/rpl/t/rpl_parallel_retry.test +++ b/mysql-test/suite/rpl/t/rpl_parallel_retry.test @@ -266,6 +266,9 @@ SELECT * FROM t1 WHERE a >= 100 ORDER BY a; CREATE TABLE t3 (a INT PRIMARY KEY, b INT, KEY b_idx(b)) ENGINE=InnoDB; INSERT INTO t3 VALUES (1,NULL), (2,2), (3,NULL), (4,4), (5, NULL), (6, 6); CREATE TABLE t4 (a INT PRIMARY KEY, b INT) ENGINE=InnoDB; +# MDEV-515 takes X-lock on the table for the first insert. +# So concurrent insert won't happen on the table +INSERT INTO t4 VALUES(100, 100); # We need statement binlog format to be able to inject debug_sync statements # on the slave with calls to foo(). @@ -390,7 +393,9 @@ DROP function foo; --connection server_1 CREATE TABLE t1 (a int PRIMARY KEY, b INT) ENGINE=InnoDB; - +# MDEV-515 takes X-lock on the table for the first insert. +# So concurrent insert won't happen on the table +INSERT INTO t1 VALUES(100, 100); # Replicate create-t1 and prepare to re-start slave in optimistic mode --sync_slave_with_master server_2 diff --git a/mysql-test/suite/rpl/t/rpl_semisync_ali_issues.test b/mysql-test/suite/rpl/t/rpl_semisync_ali_issues.test index f67c6e2ac0a..5e6f350b191 100644 --- a/mysql-test/suite/rpl/t/rpl_semisync_ali_issues.test +++ b/mysql-test/suite/rpl/t/rpl_semisync_ali_issues.test @@ -81,6 +81,10 @@ connection con1; select * from t1; truncate table t1; +# MDEV-515 takes X-lock on the table +# So concurrent DML won't happen on the table +INSERT INTO t1 VALUES (100); + sync_slave_with_master; # Test more threads in one semisync queue diff --git a/mysql-test/suite/rpl/t/rpl_xa_survive_disconnect.test b/mysql-test/suite/rpl/t/rpl_xa_survive_disconnect.test index 28d189364d6..e4193a35583 100644 --- a/mysql-test/suite/rpl/t/rpl_xa_survive_disconnect.test +++ b/mysql-test/suite/rpl/t/rpl_xa_survive_disconnect.test @@ -30,6 +30,10 @@ CREATE DATABASE d2; CREATE TABLE d1.t (a INT) ENGINE=innodb; CREATE TABLE d2.t (a INT) ENGINE=innodb; +# MDEV-515 takes X-lock on the table for the first insert. +# So concurrent DML won't happen on the table +INSERT INTO d1.t VALUES(100); + connect (master_conn1, 127.0.0.1,root,,test,$MASTER_MYPORT,); --let $conn_id=`SELECT connection_id()` SET @@session.binlog_format= statement; diff --git a/mysql-test/suite/sys_vars/r/identity_func.result b/mysql-test/suite/sys_vars/r/identity_func.result index 47a6fa856c5..2e064532228 100644 --- a/mysql-test/suite/sys_vars/r/identity_func.result +++ b/mysql-test/suite/sys_vars/r/identity_func.result @@ -14,6 +14,8 @@ id INT NOT NULL auto_increment, PRIMARY KEY (id), name VARCHAR(30) ) ENGINE = INNODB; +INSERT INTO t1 VALUES(100, "MDEV-515"); +INSERT INTO t2 VALUES(100, "MDEV-515"); '#--------------------FN_DYNVARS_035_01-------------------------#' ## It should be zero ## SELECT @@identity = 0; @@ -29,40 +31,47 @@ INSERT into t1(name) values('Record_3'); ## Verifying total values in t1 ## SELECT @@identity from t1; @@identity -3 -3 -3 +103 +103 +103 +103 ## Now inserting some data in table t2 ## INSERT into t2(name) values('Record_1'); ## Verifying total values in t2 ## SELECT @@identity from t2; @@identity -1 +101 +101 '#--------------------FN_DYNVARS_035_02-------------------------#' connect test_con2, localhost, root,,; connection test_con2; SELECT * from t1; id name +100 MDEV-515 ## Verifying total values in t1 ## SELECT @@identity from t1; @@identity +0 ## Verifying total values in t2 ## SELECT @@identity from t2; @@identity +0 ## Inserting some more records in table t1 ## INSERT into t1(name) values('Record_1_1'); INSERT into t1(name) values('Record_1_2'); ## Verifying total values in t1 ## SELECT @@identity from t1; @@identity -5 -5 +105 +105 +105 ## Inserting row in table t2 ## INSERT into t2(name) values('Record_1_3'); ## Verifying total values in t2 ## SELECT @@identity from t2; @@identity -2 +102 +102 '#--------------------FN_DYNVARS_035_03-------------------------#' connection test_con1; ## Commiting rows added in test_con1 ## @@ -70,38 +79,43 @@ COMMIT; ## Verifying records in both tables ## SELECT * from t1; id name -1 Record_1 -2 Record_2 -3 Record_3 -4 Record_1_1 -5 Record_1_2 +100 MDEV-515 +101 Record_1 +102 Record_2 +103 Record_3 +104 Record_1_1 +105 Record_1_2 SELECT * from t2; id name -1 Record_1 -2 Record_1_3 +100 MDEV-515 +101 Record_1 +102 Record_1_3 ## Verifying total values in t1 after commiting data ## SELECT @@identity from t1; @@identity -1 -1 -1 -1 -1 +101 +101 +101 +101 +101 +101 ## Verifying total values in t2 after commiting data ## SELECT @@identity from t2; @@identity -1 -1 +101 +101 +101 INSERT into t1(name) values('Record_4'); ## Now verifying value of variable after inserting 1 row in this connection ## SELECT @@identity from t1; @@identity -6 -6 -6 -6 -6 -6 +106 +106 +106 +106 +106 +106 +106 ## Dropping tables t1 & t2 ## drop table t1, t2; disconnect test_con1; diff --git a/mysql-test/suite/sys_vars/t/identity_func.test b/mysql-test/suite/sys_vars/t/identity_func.test index e3bbaa1d3a2..7398b5d0b63 100644 --- a/mysql-test/suite/sys_vars/t/identity_func.test +++ b/mysql-test/suite/sys_vars/t/identity_func.test @@ -46,6 +46,11 @@ PRIMARY KEY (id), name VARCHAR(30) ) ENGINE = INNODB; +# MDEV-515 takes X-lock on the table for the first insert +# So concurrent insert won't happen on the table +INSERT INTO t1 VALUES(100, "MDEV-515"); +INSERT INTO t2 VALUES(100, "MDEV-515"); + --echo '#--------------------FN_DYNVARS_035_01-------------------------#' ############################################### # Verifying initial value of identity. # diff --git a/mysql-test/suite/versioning/r/trx_id.result b/mysql-test/suite/versioning/r/trx_id.result index b2bb59a4150..3ddd1bf16fe 100644 --- a/mysql-test/suite/versioning/r/trx_id.result +++ b/mysql-test/suite/versioning/r/trx_id.result @@ -89,6 +89,7 @@ sys_start bigint(20) unsigned as row start invisible, sys_end bigint(20) unsigned as row end invisible, period for system_time (sys_start, sys_end) ) with system versioning; +INSERT INTO t1 VALUES(100); set transaction isolation level read committed; start transaction; insert into t1 values (1); @@ -129,25 +130,31 @@ select @ts1 < @ts2, @ts2 < @ts3; # MVCC is resolved select * from t1 for system_time as of transaction @trx_id1; x +100 1 2 3 select * from t1 for system_time as of timestamp @ts1; x +100 3 select * from t1 for system_time as of transaction @trx_id2; x +100 2 3 select * from t1 for system_time as of timestamp @ts2; x +100 2 3 select * from t1 for system_time as of transaction @trx_id3; x +100 3 select * from t1 for system_time as of timestamp @ts3; x +100 1 2 3 diff --git a/mysql-test/suite/versioning/t/trx_id.test b/mysql-test/suite/versioning/t/trx_id.test index db691a7ec19..08282f8b02f 100644 --- a/mysql-test/suite/versioning/t/trx_id.test +++ b/mysql-test/suite/versioning/t/trx_id.test @@ -87,6 +87,10 @@ create or replace table t1 ( period for system_time (sys_start, sys_end) ) with system versioning; +# MDEV-515 takes X-lock on the table for the first insert +# So concurrent DML won't happen on the table +INSERT INTO t1 VALUES(100); + set transaction isolation level read committed; start transaction; insert into t1 values (1); |