summaryrefslogtreecommitdiff
path: root/mysql-test/t/lock_multi.test
diff options
context:
space:
mode:
authorunknown <davi@mysql.com/endora.local>2008-01-29 10:37:44 -0200
committerunknown <davi@mysql.com/endora.local>2008-01-29 10:37:44 -0200
commitb46d5d6b2fbf5cd67c9c853f489221d50bec973a (patch)
treed9a546db24be7f7ced8d4c5ddd8f9e683b2bf236 /mysql-test/t/lock_multi.test
parentcdc66b12c5efc66b8148f98fc78134e7db938080 (diff)
downloadmariadb-git-b46d5d6b2fbf5cd67c9c853f489221d50bec973a.tar.gz
Fix test case of Bug 30331
mysql-test/r/lock_multi.result: Update test case result. mysql-test/t/lock_multi.test: Don't print the value of Table_lock_waited, check the precedence instead. Unlock the table before dropping.
Diffstat (limited to 'mysql-test/t/lock_multi.test')
-rw-r--r--mysql-test/t/lock_multi.test10
1 files changed, 8 insertions, 2 deletions
diff --git a/mysql-test/t/lock_multi.test b/mysql-test/t/lock_multi.test
index c8feace5c4a..f1e9c0d253f 100644
--- a/mysql-test/t/lock_multi.test
+++ b/mysql-test/t/lock_multi.test
@@ -450,7 +450,7 @@ drop table if exists t1,t2;
create table t1 (a int);
flush status;
lock tables t1 read;
-show status like 'Table_locks_waited';
+let $tlwa= `show status like 'Table_locks_waited'`;
connect (waiter,localhost,root,,);
connection waiter;
--send insert into t1 values(1);
@@ -459,9 +459,15 @@ 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;
-show status like 'Table_locks_waited';
+--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