database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Clean up innodb.innodb-read-view

Browse Source
This commit is contained in:
Marko Mäkelä
2019-08-29 08:21:54 +03:00
parent 2842ae03bc
commit 5e9b34191e
2 changed files with 3 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mysql-test/suite/innodb/r/innodb-read-view.result
View File

@ -196,7 +196,6 @@ DROP TABLE t2;
# Bug 21433768: NON-REPEATABLE READ WITH REPEATABLE READ ISOLATION # Bug 21433768: NON-REPEATABLE READ WITH REPEATABLE READ ISOLATION
# #
connect con1,localhost,root,,; connect con1,localhost,root,,;
# connection con1
CREATE TABLE t1(col1 INT PRIMARY KEY, col2 INT) ENGINE = InnoDB; CREATE TABLE t1(col1 INT PRIMARY KEY, col2 INT) ENGINE = InnoDB;
INSERT INTO t1 values (1, 0), (2, 0); INSERT INTO t1 values (1, 0), (2, 0);
SELECT * FROM t1 ORDER BY col1; SELECT * FROM t1 ORDER BY col1;
@ -208,7 +207,6 @@ UPDATE t1 SET col2 = 100;
SET DEBUG_SYNC = 'after_trx_committed_in_memory SIGNAL s1 WAIT_FOR s2'; SET DEBUG_SYNC = 'after_trx_committed_in_memory SIGNAL s1 WAIT_FOR s2';
COMMIT;; COMMIT;;
connection default; connection default;
# connection default
SET DEBUG_SYNC = 'now WAIT_FOR s1'; SET DEBUG_SYNC = 'now WAIT_FOR s1';
UPDATE t1 SET col2 = col2 + 10 where col1 = 1; UPDATE t1 SET col2 = col2 + 10 where col1 = 1;
COMMIT; COMMIT;
@ -218,10 +216,7 @@ col1 col2
2 100 2 100
SET DEBUG_SYNC = 'now SIGNAL s2'; SET DEBUG_SYNC = 'now SIGNAL s2';
connection con1; connection con1;
# connection con1
# reap COMMIT for con1
connection default;
# connection default
disconnect con1; disconnect con1;
connection default;
DROP TABLE t1; DROP TABLE t1;
SET DEBUG_SYNC= 'RESET'; SET DEBUG_SYNC= 'RESET';

10
mysql-test/suite/innodb/t/innodb-read-view.test
View File

@ -1,5 +1,6 @@
# DEBUG_SYNC must be compiled in. # DEBUG_SYNC must be compiled in.
--source include/have_debug_sync.inc --source include/have_debug_sync.inc
--source include/have_debug.inc
# We need to test the use case: # We need to test the use case:
# a. Create a transaction T1 that will be promoted to RW. # a. Create a transaction T1 that will be promoted to RW.
@ -176,7 +177,6 @@ DROP TABLE t2;
--echo # --echo #
--connect (con1,localhost,root,,) --connect (con1,localhost,root,,)
--echo # connection con1
CREATE TABLE t1(col1 INT PRIMARY KEY, col2 INT) ENGINE = InnoDB; CREATE TABLE t1(col1 INT PRIMARY KEY, col2 INT) ENGINE = InnoDB;
INSERT INTO t1 values (1, 0), (2, 0); INSERT INTO t1 values (1, 0), (2, 0);
@ -188,7 +188,6 @@ SET DEBUG_SYNC = 'after_trx_committed_in_memory SIGNAL s1 WAIT_FOR s2';
--send COMMIT; --send COMMIT;
connection default; connection default;
--echo # connection default
SET DEBUG_SYNC = 'now WAIT_FOR s1'; SET DEBUG_SYNC = 'now WAIT_FOR s1';
UPDATE t1 SET col2 = col2 + 10 where col1 = 1; UPDATE t1 SET col2 = col2 + 10 where col1 = 1;
COMMIT; COMMIT;
@ -197,18 +196,13 @@ SELECT * FROM t1 ORDER BY col1;
SET DEBUG_SYNC = 'now SIGNAL s2'; SET DEBUG_SYNC = 'now SIGNAL s2';
connection con1; connection con1;
--echo # connection con1
--echo # reap COMMIT for con1
reap; reap;
disconnect con1;
connection default; connection default;
--echo # connection default
disconnect con1;
DROP TABLE t1; DROP TABLE t1;
# Clean up resources used in this test case. # Clean up resources used in this test case.
--disable_warnings
SET DEBUG_SYNC= 'RESET'; SET DEBUG_SYNC= 'RESET';
--enable_warnings
--source include/wait_until_count_sessions.inc --source include/wait_until_count_sessions.inc