1 files changed, 0 insertions, 46 deletions
diff --git a/mysql-test/r/innodb-timeout.result b/mysql-test/r/innodb-timeout.result
deleted file mode 100644
index 2d34cdb1cda..00000000000
--- a/mysql-test/r/innodb-timeout.result
+++ /dev/null
@@ -1,46 +0,0 @@
-set global innodb_lock_wait_timeout=42;
-select @@innodb_lock_wait_timeout;
-@@innodb_lock_wait_timeout
-42
-set innodb_lock_wait_timeout=1;
-select @@innodb_lock_wait_timeout;
-@@innodb_lock_wait_timeout
-1
-select @@innodb_lock_wait_timeout;
-@@innodb_lock_wait_timeout
-42
-set global innodb_lock_wait_timeout=347;
-select @@innodb_lock_wait_timeout;
-@@innodb_lock_wait_timeout
-42
-set innodb_lock_wait_timeout=1;
-select @@innodb_lock_wait_timeout;
-@@innodb_lock_wait_timeout
-1
-select @@innodb_lock_wait_timeout;
-@@innodb_lock_wait_timeout
-347
-create table t1(a int primary key)engine=innodb;
-begin;
-insert into t1 values(1),(2),(3);
-set innodb_lock_wait_timeout=5;
-select * from t1 for update;
-commit;
-a
-1
-2
-3
-begin;
-insert into t1 values(4);
-set innodb_lock_wait_timeout=2;
-set @a= current_timestamp();
-select * from t1 for update;
-ERROR HY000: Lock wait timeout exceeded; try restarting transaction
-set @b= current_timestamp();
-set @c= timestampdiff(SECOND, @a, @b);
-select if(@c >= 1 and @c <= 10, 'OK', concat("NOT OK, time passed=", @c));
-if(@c >= 1 and @c <= 10, 'OK', concat("NOT OK, time passed=", @c))
-OK
-commit;
-drop table t1;
-set global innodb_lock_wait_timeout=50;