From c4c0e1edd5cdf47300b57cb0171dff4665985373 Mon Sep 17 00:00:00 2001
From: unknown <jmiller@mysql.com>
Date: Thu, 11 May 2006 00:58:13 +0200
Subject: [PATCH 1/2] rpl_log.test:   Correct fix for test bug #19158

mysql-test/extra/rpl_tests/rpl_log.test:
  Correct fix for test bug #19158
---
 mysql-test/extra/rpl_tests/rpl_log.test | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/mysql-test/extra/rpl_tests/rpl_log.test b/mysql-test/extra/rpl_tests/rpl_log.test
index 116bdd1028e..7cb10ed1acb 100644
--- a/mysql-test/extra/rpl_tests/rpl_log.test
+++ b/mysql-test/extra/rpl_tests/rpl_log.test
@@ -81,7 +81,12 @@ start slave;
 # This is timing out in pushbuild and should be changed to use
 # wait_slave_status.inc
 #
-sleep 2;
+--disable_query_log
+--disable_result_log
+let $result_pattern= '%127.0.0.1%root%master-bin.000002%slave-relay-bin.000007%Yes%Yes%0%0%None%';
+--source include/wait_slave_status.inc
+--enable_query_log
+--enable_result_log
 sync_with_master;
 flush logs;
 stop slave;

From f82ae1c556d66abe2dfa5613fdaca8adb13f1bf5 Mon Sep 17 00:00:00 2001
From: unknown <jmiller@mysql.com>
Date: Thu, 11 May 2006 00:59:34 +0200
Subject: [PATCH 2/2] rpl_log.test:   Remove comments not needed

mysql-test/extra/rpl_tests/rpl_log.test:
  Remove comments not needed
---
 mysql-test/extra/rpl_tests/rpl_log.test | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/mysql-test/extra/rpl_tests/rpl_log.test b/mysql-test/extra/rpl_tests/rpl_log.test
index 7cb10ed1acb..c9d9a4214d2 100644
--- a/mysql-test/extra/rpl_tests/rpl_log.test
+++ b/mysql-test/extra/rpl_tests/rpl_log.test
@@ -77,10 +77,6 @@ connection slave;
 # to go into the relay log (the master always sends a fake one when replication
 # starts). 
 start slave;
-#
-# This is timing out in pushbuild and should be changed to use
-# wait_slave_status.inc
-#
 --disable_query_log
 --disable_result_log
 let $result_pattern= '%127.0.0.1%root%master-bin.000002%slave-relay-bin.000007%Yes%Yes%0%0%None%';