mirror of
https://github.com/MariaDB/server.git
synced 2025-01-18 13:02:28 +01:00
159ff4c12c
mysql-test/r/innodb-timeout.result: Make test more robust to scheduling delays on the host running the test suite. mysql-test/suite/rpl/r/rpl_relayspace.result: Apply patch from BUG#25228 and tweak timeout value in an attempt to fix random failure of this test in Buildbot (could not repeat locally). mysql-test/suite/rpl/t/rpl_relayspace.test: Apply patch from BUG#25228 and tweak timeout value in an attempt to fix random failure of this test in Buildbot (could not repeat locally). mysql-test/t/innodb-timeout.test: Make test more robust to scheduling delays on the host running the test suite. mysql-test/valgrind.supp: Add suppression for Glibc bug.
46 lines
1.1 KiB
Text
46 lines
1.1 KiB
Text
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;
|