bk commit into 5.1 tree (jmiller:1.2397)

[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
  1.2397 06/05/16 14:59:44 jmiller@stripped +1 -0
  rpl_log.test:
    Fix for failure in aix52 failure during push build

  mysql-test/extra/rpl_tests/rpl_log.test
    1.36 06/05/16 14:59:13 jmiller@stripped +1 -1
    Fix for failure in aix52 failure during push build

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jmiller
# Host:	ndb08.mysql.com
# Root:	/home/ndbdev/jmiller/clones/mysql-5.1-new

--- 1.35/mysql-test/extra/rpl_tests/rpl_log.test	2006-05-11 00:59:21 +02:00
+++ 1.36/mysql-test/extra/rpl_tests/rpl_log.test	2006-05-16 14:59:13 +02:00
@@ -79,7 +79,7 @@
 start slave;
 --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%';
+let $result_pattern= '%127.0.0.1%root%master-bin.000002%slave-relay-bin.000005%Yes%Yes%0%0%None%';
 --source include/wait_slave_status.inc
 --enable_query_log
 --enable_result_log