database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge mysql-5.5 -> mysql-5.5-innodb

Browse Source
This commit is contained in:
Vasil Dimov
2011-01-24 09:42:07 +02:00
parent ba5bc8a1ca 494e67d3c5
commit 214ade1149
285 changed files with 4663 additions and 6185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mysql-test/suite/innodb/r/innodb-timeout.result
View File

@ -13,13 +13,14 @@ set global innodb_lock_wait_timeout=347;
select @@innodb_lock_wait_timeout;
@@innodb_lock_wait_timeout
42
set innodb_lock_wait_timeout=1;
set innodb_lock_wait_timeout=10;
select @@innodb_lock_wait_timeout;
@@innodb_lock_wait_timeout
1
10
select @@innodb_lock_wait_timeout;
@@innodb_lock_wait_timeout
347
SET @connection_b_id = <connection_b_id>;
create table t1(a int primary key)engine=innodb;
begin;
insert into t1 values(1),(2),(3);
@ -31,8 +32,9 @@ a
3
begin;
insert into t1 values(4);
set innodb_lock_wait_timeout=3;
select * from t1 for update;
commit;
ERROR HY000: Lock wait timeout exceeded; try restarting transaction
drop table t1;
set global innodb_lock_wait_timeout=50;
set global innodb_lock_wait_timeout=<initial_timeout>;