diff options
| -rw-r--r-- | mysql-test/r/transaction_timeout.result | 86 | ||||
| -rw-r--r-- | mysql-test/t/transaction_timeout.test | 45 |
2 files changed, 13 insertions, 118 deletions
diff --git a/mysql-test/r/transaction_timeout.result b/mysql-test/r/transaction_timeout.result index 1b8d7dbc2a5..c8db4a0e744 100644 --- a/mysql-test/r/transaction_timeout.result +++ b/mysql-test/r/transaction_timeout.result @@ -1,125 +1,51 @@ -connect c0,localhost,root,,test,,; -SET autocommit=0; CREATE TABLE t1 (a INT) ENGINE=InnoDB; +# Test idle_transaction_timeout +connect c0,localhost,root,,test,,; SHOW VARIABLES LIKE 'idle_%transaction_timeout'; Variable_name Value idle_readonly_transaction_timeout 0 idle_readwrite_transaction_timeout 0 idle_transaction_timeout 0 +SET autocommit=0; SET idle_transaction_timeout=1; -SHOW VARIABLES LIKE 'idle_%transaction_timeout'; -Variable_name Value -idle_readonly_transaction_timeout 0 -idle_readwrite_transaction_timeout 0 -idle_transaction_timeout 1 BEGIN; -INSERT INTO t1 VALUES (1),(2),(3); -COMMIT; SELECT * FROM t1; a -1 -2 -3 -BEGIN; -INSERT INTO t1 VALUES (4),(5),(6); SELECT * FROM t1; Got one of the listed errors disconnect c0; +# Test idle_readonly_transaction_timeout connect c1,localhost,root,,test,,; -SELECT * FROM t1; -a -1 -2 -3 -DROP TABLE t1; -SET idle_transaction_timeout=0; SHOW VARIABLES LIKE 'idle_%transaction_timeout'; Variable_name Value idle_readonly_transaction_timeout 0 idle_readwrite_transaction_timeout 0 idle_transaction_timeout 0 SET autocommit=0; -CREATE TABLE t1 (a INT) ENGINE=InnoDB; -SHOW VARIABLES LIKE 'idle_%transaction_timeout'; -Variable_name Value -idle_readonly_transaction_timeout 0 -idle_readwrite_transaction_timeout 0 -idle_transaction_timeout 0 SET idle_readonly_transaction_timeout=1; -SHOW VARIABLES LIKE 'idle_%transaction_timeout'; -Variable_name Value -idle_readonly_transaction_timeout 1 -idle_readwrite_transaction_timeout 0 -idle_transaction_timeout 0 BEGIN; -INSERT INTO t1 VALUES (1),(2),(3); SELECT * FROM t1; a -1 -2 -3 -COMMIT; -SELECT * FROM t1; -a -1 -2 -3 SELECT * FROM t1; Got one of the listed errors disconnect c1; +# Test idle_readwrite_transaction_timeout connect c2,localhost,root,,test,,; -SELECT * FROM t1; -a -1 -2 -3 -DROP TABLE t1; -SET idle_readonly_transaction_timeout=0; SHOW VARIABLES LIKE 'idle_%transaction_timeout'; Variable_name Value idle_readonly_transaction_timeout 0 idle_readwrite_transaction_timeout 0 idle_transaction_timeout 0 SET autocommit=0; -CREATE TABLE t1 (a INT) ENGINE=InnoDB; -SHOW VARIABLES LIKE 'idle_%transaction_timeout'; -Variable_name Value -idle_readonly_transaction_timeout 0 -idle_readwrite_transaction_timeout 0 -idle_transaction_timeout 0 SET idle_readwrite_transaction_timeout=1; -SHOW VARIABLES LIKE 'idle_%transaction_timeout'; -Variable_name Value -idle_readonly_transaction_timeout 0 -idle_readwrite_transaction_timeout 1 -idle_transaction_timeout 0 BEGIN; -INSERT INTO t1 VALUES (1),(2),(3); -SELECT * FROM t1; -a -1 -2 -3 -COMMIT; SELECT * FROM t1; a -1 -2 -3 SELECT * FROM t1; a -1 -2 -3 -INSERT INTO t1 VALUES (4),(5),(6); +INSERT INTO t1 VALUES (1); SELECT * FROM t1; Got one of the listed errors disconnect c2; connection default; DROP TABLE t1; -SET idle_readwrite_transaction_timeout=0; -SHOW VARIABLES LIKE 'idle_%transaction_timeout'; -Variable_name Value -idle_readonly_transaction_timeout 0 -idle_readwrite_transaction_timeout 0 -idle_transaction_timeout 0 diff --git a/mysql-test/t/transaction_timeout.test b/mysql-test/t/transaction_timeout.test index bcf059fc067..36d835cc381 100644 --- a/mysql-test/t/transaction_timeout.test +++ b/mysql-test/t/transaction_timeout.test @@ -1,85 +1,54 @@ -# Test Case For Kill All Transactions --source include/no_protocol.inc --source include/have_innodb.inc --source include/not_embedded.inc -connect (c0,localhost,root,,test,,); -SET autocommit=0; CREATE TABLE t1 (a INT) ENGINE=InnoDB; +--echo # Test idle_transaction_timeout +connect (c0,localhost,root,,test,,); SHOW VARIABLES LIKE 'idle_%transaction_timeout'; +SET autocommit=0; SET idle_transaction_timeout=1; -SHOW VARIABLES LIKE 'idle_%transaction_timeout'; BEGIN; -INSERT INTO t1 VALUES (1),(2),(3); -COMMIT; SELECT * FROM t1; - -BEGIN; -INSERT INTO t1 VALUES (4),(5),(6); sleep 2; --error 2006,2013 SELECT * FROM t1; disconnect c0; +--echo # Test idle_readonly_transaction_timeout connect (c1,localhost,root,,test,,); -SELECT * FROM t1; -DROP TABLE t1; -SET idle_transaction_timeout=0; SHOW VARIABLES LIKE 'idle_%transaction_timeout'; - -# Test Case For Kill Read-Only Transaction SET autocommit=0; -CREATE TABLE t1 (a INT) ENGINE=InnoDB; - -SHOW VARIABLES LIKE 'idle_%transaction_timeout'; SET idle_readonly_transaction_timeout=1; -SHOW VARIABLES LIKE 'idle_%transaction_timeout'; BEGIN; -INSERT INTO t1 VALUES (1),(2),(3); SELECT * FROM t1; -COMMIT; -SELECT * FROM t1; - sleep 2; --error 2006,2013 # Gone away SELECT * FROM t1; disconnect c1; +--echo # Test idle_readwrite_transaction_timeout connect (c2,localhost,root,,test,,); -SELECT * FROM t1; -DROP TABLE t1; -SET idle_readonly_transaction_timeout=0; SHOW VARIABLES LIKE 'idle_%transaction_timeout'; - -# Test Case For Kill Changes Transaction SET autocommit=0; -CREATE TABLE t1 (a INT) ENGINE=InnoDB; - -SHOW VARIABLES LIKE 'idle_%transaction_timeout'; SET idle_readwrite_transaction_timeout=1; -SHOW VARIABLES LIKE 'idle_%transaction_timeout'; BEGIN; -INSERT INTO t1 VALUES (1),(2),(3); -SELECT * FROM t1; -COMMIT; SELECT * FROM t1; - sleep 2; SELECT * FROM t1; -INSERT INTO t1 VALUES (4),(5),(6); +INSERT INTO t1 VALUES (1); sleep 2; + --error 2006, 2013 # Gone away SELECT * FROM t1; disconnect c2; connection default; DROP TABLE t1; -SET idle_readwrite_transaction_timeout=0; -SHOW VARIABLES LIKE 'idle_%transaction_timeout'; |