bk commit into 6.0 tree (tnurnberg:1.2637) BUG#33931

[Tatjana A Nuernberg]

Below is the list of changes that have just been committed into a local
6.0 repository of tnurnberg.  When tnurnberg 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-05-01 07:25:21+02:00, tnurnberg@stripped +2 -0
  post-merge fixes for 6.0-bugteam / 6.0-main
  correct test results for Bug#33931

  mysql-test/include/wait_for_slave_to_start.inc@stripped, 2008-05-01 07:25:20+02:00, tnurnberg@stripped +3 -0
    bring in line with wait_for_slave_to_stop.inc

  mysql-test/suite/rpl/r/rpl_bug33931.result@stripped, 2008-05-01 07:25:20+02:00, tnurnberg@stripped +2 -1
    bring in line with actual output

diff -Nrup a/mysql-test/include/wait_for_slave_to_start.inc b/mysql-test/include/wait_for_slave_to_start.inc
--- a/mysql-test/include/wait_for_slave_to_start.inc	2007-06-19 13:06:09 +02:00
+++ b/mysql-test/include/wait_for_slave_to_start.inc	2008-05-01 07:25:20 +02:00
@@ -26,6 +26,9 @@ while ($run)
   sleep 0.1;
   if (!$counter){
     --echo "Failed while waiting for slave to start"
+    --replace_result $MASTER_MYPORT MASTER_PORT
+#   --replace_column 1 # 7 # 8 # 9 # 22 # 23 # 33 #
+    --replace_column 1 # 8 # 9 # 23 # 33 #
     query_vertical SHOW SLAVE STATUS;
     exit;
   }
diff -Nrup a/mysql-test/suite/rpl/r/rpl_bug33931.result b/mysql-test/suite/rpl/r/rpl_bug33931.result
--- a/mysql-test/suite/rpl/r/rpl_bug33931.result	2008-02-19 20:02:12 +01:00
+++ b/mysql-test/suite/rpl/r/rpl_bug33931.result	2008-05-01 07:25:20 +02:00
@@ -4,7 +4,8 @@ reset master;
 reset slave;
 drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
 start slave;
-show slave status;
+"Failed while waiting for slave to start"
+SHOW SLAVE STATUS;
 Slave_IO_State	#
 Master_Host	127.0.0.1
 Master_User	root