diff options
| author | Andrei <andrei.elkin@mariadb.com> | 2023-01-28 14:30:46 +0200 |
|---|---|---|
| committer | Andrei <andrei.elkin@mariadb.com> | 2023-01-28 15:21:23 +0200 |
| commit | c73985f2ce8a391582787f3e310a011c1a712bec (patch) | |
| tree | 0dc2d0b3e4a6177d7b0f4e50eb8ac5f10bed5513 | |
| parent | 2279dddad6bea00c5774a76f410c11fd56ad168f (diff) | |
| download | mariadb-git-c73985f2ce8a391582787f3e310a011c1a712bec.tar.gz | |
MDEV-30010 post-push: fixing test results.mariadb-10.3.38
| -rw-r--r-- | mysql-test/suite/binlog/r/binlog_recovery_after_checksum_change.result | 8 | ||||
| -rw-r--r-- | mysql-test/suite/binlog/r/innodb_rc_insert_before_delete.result | 52 |
2 files changed, 52 insertions, 8 deletions
diff --git a/mysql-test/suite/binlog/r/binlog_recovery_after_checksum_change.result b/mysql-test/suite/binlog/r/binlog_recovery_after_checksum_change.result deleted file mode 100644 index 85b0b84c684..00000000000 --- a/mysql-test/suite/binlog/r/binlog_recovery_after_checksum_change.result +++ /dev/null @@ -1,8 +0,0 @@ -connection default; -set @@global.binlog_checksum=none; -set @@session.debug_dbug='d,crash_before_write_second_checkpoint_event'; -set @@global.binlog_checksum=crc32; -ERROR HY000: Lost connection to MySQL server during query -connection default; -NOT FOUND /Replication event checksum verification failed/ in mysqld.1.err -End of the tests diff --git a/mysql-test/suite/binlog/r/innodb_rc_insert_before_delete.result b/mysql-test/suite/binlog/r/innodb_rc_insert_before_delete.result new file mode 100644 index 00000000000..24d748b7673 --- /dev/null +++ b/mysql-test/suite/binlog/r/innodb_rc_insert_before_delete.result @@ -0,0 +1,52 @@ +connect pause_purge,localhost,root; +START TRANSACTION WITH CONSISTENT SNAPSHOT; +connection default; +CREATE TABLE t (pk int PRIMARY KEY, sk INT UNIQUE) ENGINE=InnoDB; +INSERT INTO t VALUES (10, 100); +connect con1,localhost,root; +BEGIN; +SELECT * FROM t WHERE sk = 100 FOR UPDATE; +pk sk +10 100 +connect con2,localhost,root; +SET DEBUG_SYNC="lock_wait_suspend_thread_enter SIGNAL insert_wait_started"; +INSERT INTO t VALUES (5, 100) # trx 1; +connect con3,localhost,root; +SET TRANSACTION ISOLATION LEVEL READ COMMITTED; +SET DEBUG_SYNC="now WAIT_FOR insert_wait_started"; +SET DEBUG_SYNC="lock_wait_suspend_thread_enter SIGNAL delete_started_waiting"; +BEGIN; +UPDATE t SET sk = 200 WHERE sk = 100; # trx 2; +connection con1; +SET DEBUG_SYNC="now WAIT_FOR delete_started_waiting"; +DELETE FROM t WHERE sk=100; +COMMIT; +disconnect con1; +connection con2; +disconnect con2; +connection con3; +must be logged in ROW format as the only event of trx 2 (con3) +INSERT INTO t VALUES (11, 101); +COMMIT; +include/show_binlog_events.inc +Log_name Pos Event_type Server_id End_log_pos Info +master-bin.000001 # Gtid # # BEGIN GTID #-#-# +master-bin.000001 # Query # # use `test`; DELETE FROM t WHERE sk=100 +master-bin.000001 # Xid # # COMMIT /* XID */ +master-bin.000001 # Gtid # # BEGIN GTID #-#-# +master-bin.000001 # Query # # use `test`; INSERT INTO t VALUES (5, 100) # trx 1 +master-bin.000001 # Xid # # COMMIT /* XID */ +master-bin.000001 # Gtid # # BEGIN GTID #-#-# +master-bin.000001 # Annotate_rows # # INSERT INTO t VALUES (11, 101) +master-bin.000001 # Table_map # # table_id: # (test.t) +master-bin.000001 # Write_rows_v1 # # table_id: # flags: STMT_END_F +master-bin.000001 # Xid # # COMMIT /* XID */ +disconnect con3; +connection default; +SELECT * FROM t; +pk sk +5 100 +11 101 +disconnect pause_purge; +SET DEBUG_SYNC="RESET"; +DROP TABLE t; |