mirror of
https://github.com/MariaDB/server.git
synced 2025-08-21 16:03:24 +03:00
a03c9ff55f
The original XtraDB (and InnoDB plugin) is shipped as a separate source tree which is copied into the MySQL source, after which a setup.sh script must be run to move things into place. Now that XtraDB is part of the MariaDB source tree, this commit fixes these things up once and for all: - New innodb build scripts. - Test suite fixes (new tests and patches to existing). - Remove files no longer needed due to this.
65 lines
1.1 KiB
Plaintext
65 lines
1.1 KiB
Plaintext
-- 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;
|