diff options
| author | unknown <davi@mysql.com/endora.local> | 2008-02-06 09:40:59 -0200 |
|---|---|---|
| committer | unknown <davi@mysql.com/endora.local> | 2008-02-06 09:40:59 -0200 |
| commit | ee42ff6398a1e1ccc1a820f63609849259fad768 (patch) | |
| tree | f66347f291d1d115659ef75a2c1f25ef1db6684f /mysql-test/t/lock_multi.test | |
| parent | 4df3bc0c3d3b9f54e096b8bfcda46c1d98ddaaec (diff) | |
| download | mariadb-git-ee42ff6398a1e1ccc1a820f63609849259fad768.tar.gz | |
Bug#34311 main.lock_multi.test fails
Re-enable the test case for Bug 30331.
mysql-test/r/lock_multi.result:
Update the test case result for Bug#30331
mysql-test/t/lock_multi.test:
Re-enable the test case for Bug#30331
Diffstat (limited to 'mysql-test/t/lock_multi.test')
| -rw-r--r-- | mysql-test/t/lock_multi.test | 59 |
1 files changed, 27 insertions, 32 deletions
diff --git a/mysql-test/t/lock_multi.test b/mysql-test/t/lock_multi.test index a7965e429ef..06488abb1ae 100644 --- a/mysql-test/t/lock_multi.test +++ b/mysql-test/t/lock_multi.test @@ -440,38 +440,33 @@ disconnect flush; drop table t1; # +# Bug#30331: Table_locks_waited shows inaccurate values # -# This test case was disabled due to Bug#34311: main.lock_multy.test fails. -# -# # -# # Bug#30331: Table_locks_waited shows inaccurate values -# # -# -# --disable_warnings -# drop table if exists t1,t2; -# --enable_warnings -# -# create table t1 (a int); -# flush status; -# lock tables t1 read; -# let $tlwa= `show status like 'Table_locks_waited'`; -# connect (waiter,localhost,root,,); -# connection waiter; -# --send insert into t1 values(1); -# connection default; -# let $wait_condition= -# select count(*) = 1 from information_schema.processlist -# where state = "Locked" and info = "insert into t1 values(1)"; -# --source include/wait_condition.inc -# let $tlwb= `show status like 'Table_locks_waited'`; -# unlock tables; -# drop table t1; -# disconnect waiter; -# connection default; -# --disable_query_log -# eval SET @tlwa= SUBSTRING_INDEX('$tlwa', ' ', -1); -# eval SET @tlwb= SUBSTRING_INDEX('$tlwb', ' ', -1); -# --enable_query_log -# select @tlwa < @tlwb; + +--disable_warnings +drop table if exists t1,t2; +--enable_warnings +create table t1 (a int); +flush status; +lock tables t1 read; +let $tlwa= `show status like 'Table_locks_waited'`; +connect (waiter,localhost,root,,); +connection waiter; +--send insert into t1 values(1); +connection default; +let $wait_condition= + select count(*) = 1 from information_schema.processlist + where state = "Locked" and info = "insert into t1 values(1)"; +--source include/wait_condition.inc +let $tlwb= `show status like 'Table_locks_waited'`; +unlock tables; +drop table t1; +disconnect waiter; +connection default; +--disable_query_log +eval SET @tlwa= SUBSTRING_INDEX('$tlwa', ' ', -1); +eval SET @tlwb= SUBSTRING_INDEX('$tlwb', ' ', -1); +--enable_query_log +select @tlwa < @tlwb; --echo End of 5.1 tests |