List:Commits« Previous MessageNext Message »
From:Davi Arnaut Date:February 27 2008 9:08pm
Subject:bk commit into 5.1 tree (davi:1.2545)
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-27 18:08:29-03:00, davi@stripped +2 -0
  Fix for team tree failure. Synchronously wait for the query state
  to reach the desired value.

  mysql-test/r/flush_read_lock_kill.result@stripped, 2008-02-27 18:08:27-03:00, davi@stripped +1 -0
    Update test case result.

  mysql-test/t/flush_read_lock_kill.test@stripped, 2008-02-27 18:08:27-03:00, davi@stripped +12 -1
    Wait for the debug synchronization point to be reached.

diff -Nrup a/mysql-test/r/flush_read_lock_kill.result b/mysql-test/r/flush_read_lock_kill.result
--- a/mysql-test/r/flush_read_lock_kill.result	2006-10-04 08:09:34 -03:00
+++ b/mysql-test/r/flush_read_lock_kill.result	2008-02-27 18:08:27 -03:00
@@ -1,3 +1,4 @@
+set @@global.concurrent_insert= 0;
 drop table if exists t1;
 create table t1 (kill_id int);
 insert into t1 values(connection_id());
diff -Nrup a/mysql-test/t/flush_read_lock_kill.test b/mysql-test/t/flush_read_lock_kill.test
--- a/mysql-test/t/flush_read_lock_kill.test	2006-05-12 13:58:52 -03:00
+++ b/mysql-test/t/flush_read_lock_kill.test	2008-02-27 18:08:27 -03:00
@@ -12,6 +12,10 @@
 
 -- source include/have_debug.inc
 
+# Disable concurrent inserts to avoid test failures when reading the
+# connection id which was inserted into a table by another thread.
+set @@global.concurrent_insert= 0;
+
 connect (con1,localhost,root,,);
 connect (con2,localhost,root,,);
 connection con1;
@@ -34,7 +38,14 @@ send flush tables with read lock;
 connection con2;
 select ((@id := kill_id) - kill_id) from t1; 
 
---sleep 2 # leave time for FLUSH to block
+# Wait for the debug sync point, test won't run on non-debug
+# builds anyway.
+let $wait_condition=
+  select count(*) = 1 from information_schema.processlist
+  where state = "Waiting for all running commits to finish"
+  and info = "flush tables with read lock";
+--source include/wait_condition.inc
+
 kill connection @id;
 
 connection con1;
Thread
bk commit into 5.1 tree (davi:1.2545)Davi Arnaut28 Feb