bk commit into 5.1 tree (jmiller:1.2557) BUG#30209

[Jonathan Miller]

Below is the list of changes that have just been committed into a local
5.1 repository of ndbdev. When ndbdev 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, 2007-08-11 00:07:11+02:00, jmiller@stripped +2 -0
  rpl_packet.test:
    Changed patch to Mats suggestion from review. Patch is for Bug#30209
  .del-wait_for_slave_running_off.inc:
    Delete: mysql-test/include/wait_for_slave_running_off.inc

  BitKeeper/deleted/.del-wait_for_slave_running_off.inc@stripped, 2007-08-11 00:05:12+02:00,
jmiller@stripped +0 -0
    Delete: mysql-test/include/wait_for_slave_running_off.inc

  mysql-test/suite/rpl/t/rpl_packet.test@stripped, 2007-08-11 00:06:07+02:00,
jmiller@stripped +1 -1
    Changed patch to Mats suggestion

diff -Nrup a/mysql-test/include/wait_for_slave_running_off.inc
b/mysql-test/include/wait_for_slave_running_off.inc
--- a/mysql-test/include/wait_for_slave_running_off.inc	2007-08-09 23:18:18 +02:00
+++ /dev/null	Wed Dec 31 16:00:00 196900
@@ -1,35 +0,0 @@
-###################################################
-#Author: Jeb
-#Date: 2007-08-09
-#Purpose: This is to address timing issue recorded  
-#         in bug 30209. This function with wait
-#         until "SHOW STATUS LIKE 'Slave_running'"
-#         returns 'OFF'
-#Details:
-#      1) Fill in and setup variable
-#      2) loop through looking OFF
-#      3) If loops too long die.
-####################################################
-connection slave;
-let $row_number= 1;
-let $run= 1;
-let $counter= 300;
-
-while ($run)
-{
-  let $running_result= query_get_value(SHOW STATUS LIKE 'Slave_running', Value,
$row_number);
-  if (`SELECT '$running_result' = 'OFF'`){
-    let $run= 0;
-  }
-  sleep 0.1;
-  if (!$counter){
-    --echo "Failed while waiting for slave to stop"
-    --replace_result $MASTER_MYPORT MASTER_PORT
-    --replace_column 1 # 7 # 8 # 9 # 22 # 23 # 33 #
-    query_vertical SHOW SLAVE STATUS;
-    exit;
-  }
-  dec $counter;
-}
-
-
diff -Nrup a/mysql-test/suite/rpl/t/rpl_packet.test
b/mysql-test/suite/rpl/t/rpl_packet.test
--- a/mysql-test/suite/rpl/t/rpl_packet.test	2007-08-09 23:17:59 +02:00
+++ b/mysql-test/suite/rpl/t/rpl_packet.test	2007-08-11 00:06:07 +02:00
@@ -68,7 +68,7 @@ INSERT INTO `t1`(`f1`) VALUES ('aaaaaaaa
 # The slave I/O thread must stop after trying to read the above event
 connection slave; 
 sleep 2;
---source include/wait_for_slave_running_off.inc
+--source include/wait_for_slave_io_to_stop.inc
 SHOW STATUS LIKE 'Slave_running';
 
 # cleanup