Adding upstream version 1:10.11.6.upstream/1%10.11.6upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 54 insertions, 0 deletions

diff --git a/mysql-test/main/transaction_timeout.test b/mysql-test/main/transaction_timeout.test
new file mode 100644
index 00000000..f2a04449
--- /dev/null
+++ b/mysql-test/main/transaction_timeout.test
@@ -0,0 +1,54 @@
+--source include/no_protocol.inc
+--source include/have_innodb.inc
+--source include/not_embedded.inc
+
+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;
+
+BEGIN;
+SELECT * FROM t1;
+sleep 2;
+
+--error 2006,2013
+SELECT * FROM t1;
+disconnect c0;
+
+--echo # Test idle_readonly_transaction_timeout
+connect (c1,localhost,root,,test,,);
+SHOW VARIABLES LIKE 'idle_%transaction_timeout';
+SET autocommit=0;
+SET idle_readonly_transaction_timeout=1;
+
+BEGIN;
+SELECT * FROM t1;
+sleep 2;
+
+--error 2006,2013 # Gone away
+SELECT * FROM t1;
+disconnect c1;
+
+--echo # Test idle_write_transaction_timeout
+connect (c2,localhost,root,,test,,);
+SHOW VARIABLES LIKE 'idle_%transaction_timeout';
+SET autocommit=0;
+SET idle_write_transaction_timeout=1;
+
+BEGIN;
+SELECT * FROM t1;
+sleep 2;
+
+SELECT * FROM t1;
+INSERT INTO t1 VALUES (1);
+sleep 2;
+
+--error 2006, 2013 # Gone away
+SELECT * FROM t1;
+disconnect c2;
+
+connection default;
+DROP TABLE t1;