mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 13:02:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:Tokutek/ft-engine

Browse source
This commit is contained in:
Rich Prohaska 2013-12-11 14:43:07 -05:00
commit c42c51c742
3 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
mysql-test/suite/tokudb/t/i_s_tokudb_lock_waits_released.test
View file

@ -27,7 +27,8 @@ send insert into t values (1);
# should find the presence of a lock on 1st transaction
connection default;
real_sleep 1; # give some time for conn_b to block
let $wait_condition= select count(*)=1 from information_schema.processlist where info='insert into t values (1)' and state='update';
source include/wait_condition.inc;
replace_column 1 TRX_ID 2 MYSQL_ID;
select * from information_schema.tokudb_locks;

3
mysql-test/suite/tokudb/t/i_s_tokudb_lock_waits_timeout.test
View file

@ -24,7 +24,8 @@ send insert into t values (1);
# should find the presence of a lock on 1st transaction
connection default;
real_sleep 1; # give some time for conn_b to get blocked
let $wait_condition= select count(*)=1 from information_schema.processlist where info='insert into t values (1)' and state='update';
source include/wait_condition.inc;
replace_column 1 TRX_ID 2 MYSQL_ID;
select * from information_schema.tokudb_locks;

3
mysql-test/suite/tokudb/t/i_s_tokudb_locks_released.test
View file

@ -30,7 +30,8 @@ send insert into t values (1);
# should find the presence of a lock on 2nd transaction
connection default;
real_sleep 1; # give some time for conn_b to get blocked
let $wait_condition= select count(*)=1 from information_schema.processlist where info='insert into t values (1)' and state='update';
source include/wait_condition.inc;
replace_column 1 TRX_ID 2 MYSQL_ID;
eval select * from information_schema.tokudb_locks;