MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Davi Arnaut Date:February 6 2008 11:41am
Subject:bk commit into 5.1 tree (davi:1.2519) BUG#34311
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of davi.  When davi does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-02-06 09:40:59-02:00, davi@stripped +2 -0
  Bug#34311 main.lock_multi.test fails
  
  Re-enable the test case for Bug 30331.

  mysql-test/r/lock_multi.result@stripped, 2008-02-06 09:40:56-02:00, davi@stripped +10 -0
    Update the test case result for Bug#30331

  mysql-test/t/lock_multi.test@stripped, 2008-02-06 09:40:57-02:00, davi@stripped +27 -32
    Re-enable the test case for Bug#30331

diff -Nrup a/mysql-test/r/lock_multi.result b/mysql-test/r/lock_multi.result
--- a/mysql-test/r/lock_multi.result	2008-02-05 13:08:01 -02:00
+++ b/mysql-test/r/lock_multi.result	2008-02-06 09:40:56 -02:00
@@ -143,4 +143,14 @@ connection: default
 flush tables;
 unlock tables;
 drop table t1;
+drop table if exists t1,t2;
+create table t1 (a int);
+flush status;
+lock tables t1 read;
+insert into t1 values(1);;
+unlock tables;
+drop table t1;
+select @tlwa < @tlwb;
+@tlwa < @tlwb
+1
 End of 5.1 tests
diff -Nrup a/mysql-test/t/lock_multi.test b/mysql-test/t/lock_multi.test
--- a/mysql-test/t/lock_multi.test	2008-02-05 13:08:01 -02:00
+++ b/mysql-test/t/lock_multi.test	2008-02-06 09:40:57 -02:00
@@ -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
Thread
bk commit into 5.1 tree (davi:1.2519) BUG#34311Davi Arnaut6 Feb