mirror of
https://github.com/MariaDB/server.git
synced 2025-05-08 15:01:49 +03:00
b4ac7f8c15
mysql-test/lib/mtr_cases.pm: Expand test cases list with test cases to test InnoDB plugin. mysql-test/mysql-test-run.pl: Added "innodb" suite to default list of suites. mysql-test/suite/innodb/include/have_innodb_plugin.inc: This file determines if innodb plugin is available. mysql-test/suite/innodb/my.cnf: Removed temporary my.cnf, which was added for testing. Not needed anymore - options are substituted by mtr. mysql-test/suite/innodb/t/innodb-analyze.test: This test can only be run with InnoDB plugin. mysql-test/suite/innodb/t/innodb-timeout.test: This test can only be run with InnoDB plugin. mysql-test/suite/innodb/t/innodb-use-sys-malloc-master.opt: Use "loose" prefix with mysqld options. This makes this test skipped properly when no innodb is available. mysql-test/suite/innodb/t/innodb-use-sys-malloc.test: This test can only be run with InnoDB plugin. mysql-test/suite/innodb/t/innodb-zip.test: This test can only be run with InnoDB plugin. mysql-test/suite/innodb/t/innodb_bug36169.test: This test can only be run with InnoDB plugin. mysql-test/suite/innodb/t/innodb_bug36172.test: This test can only be run with InnoDB plugin. mysql-test/suite/innodb/t/innodb_information_schema.test: This test can only be run with InnoDB plugin.
66 lines
1.1 KiB
Plaintext
66 lines
1.1 KiB
Plaintext
-- source include/have_innodb.inc
|
|
-- source suite/innodb/include/have_innodb_plugin.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;
|