mirror of
https://github.com/MariaDB/server.git
synced 2025-01-22 14:54:20 +01:00
7fa1449eac
mysql-test/lib/mtr_cases.pm: there is only one InnoDB in this tree, no need to run an InnoDB test twice mysql-test/suite/innodb/include/have_innodb_plugin.inc: plugin is now the builtin mysql-test/suite/innodb/t/innodb-analyze.test: plugin is now the builtin mysql-test/suite/innodb/t/innodb-timeout.test: plugin is now the builtin mysql-test/suite/innodb/t/innodb-use-sys-malloc.test: plugin is now the builtin mysql-test/suite/innodb/t/innodb-zip.test: plugin is now the builtin mysql-test/suite/innodb/t/innodb_bug36169.test: plugin is now the builtin mysql-test/suite/innodb/t/innodb_bug36172.test: plugin is now the builtin mysql-test/suite/innodb/t/innodb_file_format.test: plugin is now the builtin mysql-test/suite/innodb/t/innodb_information_schema.test: plugin is now the builtin storage/innodb_plugin/plug.in: build libinnobase.a, to have it built-in
64 lines
1.1 KiB
Text
64 lines
1.1 KiB
Text
-- source include/have_innodb.inc
|
|
|
|
let $timeout=`select @@innodb_lock_wait_timeout`;
|
|
set global innodb_lock_wait_timeout=42;
|
|
|
|
connect (a,localhost,root,,);
|
|
connect (b,localhost,root,,);
|
|
|
|
connection a;
|
|
select @@innodb_lock_wait_timeout;
|
|
set innodb_lock_wait_timeout=1;
|
|
select @@innodb_lock_wait_timeout;
|
|
|
|
connection b;
|
|
select @@innodb_lock_wait_timeout;
|
|
set global innodb_lock_wait_timeout=347;
|
|
select @@innodb_lock_wait_timeout;
|
|
set innodb_lock_wait_timeout=1;
|
|
select @@innodb_lock_wait_timeout;
|
|
|
|
connect (c,localhost,root,,);
|
|
connection c;
|
|
select @@innodb_lock_wait_timeout;
|
|
connection default;
|
|
disconnect c;
|
|
|
|
connection a;
|
|
create table t1(a int primary key)engine=innodb;
|
|
begin;
|
|
insert into t1 values(1),(2),(3);
|
|
|
|
connection b;
|
|
--send
|
|
select * from t1 for update;
|
|
|
|
connection a;
|
|
commit;
|
|
|
|
connection b;
|
|
reap;
|
|
|
|
connection a;
|
|
begin;
|
|
insert into t1 values(4);
|
|
|
|
connection b;
|
|
--send
|
|
select * from t1 for update;
|
|
|
|
connection a;
|
|
sleep 2;
|
|
commit;
|
|
|
|
connection b;
|
|
--error ER_LOCK_WAIT_TIMEOUT
|
|
reap;
|
|
drop table t1;
|
|
|
|
connection default;
|
|
|
|
disconnect a;
|
|
disconnect b;
|
|
|
|
eval set global innodb_lock_wait_timeout=$timeout;
|