bk commit into 5.1 tree (jmiller:1.2398)

[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.2398 06/05/16 15:38:21 jmiller@stripped +4 -0
  Updated to fix bug in AIX

  mysql-test/r/rpl_row_log_innodb.result
    1.7 06/05/16 15:37:55 jmiller@stripped +4 -0
    New results file

  mysql-test/r/rpl_row_log.result
    1.8 06/05/16 15:37:48 jmiller@stripped +4 -0
    New results file

  mysql-test/r/rpl_stm_log.result
    1.68 06/05/16 15:37:39 jmiller@stripped +4 -0
    New results file

  mysql-test/extra/rpl_tests/rpl_log.test
    1.37 06/05/16 15:37:17 jmiller@stripped +0 -4
    Remove disable log per lars

# 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.6/mysql-test/r/rpl_row_log_innodb.result	2006-03-17 18:10:58 +01:00
+++ 1.7/mysql-test/r/rpl_row_log_innodb.result	2006-05-16 15:37:55 +02:00
@@ -41,6 +41,10 @@
 flush logs;
 create table t3 (a int)ENGINE=InnoDB;
 start slave;
+
+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
 flush logs;
 stop slave;
 create table t2 (n int)ENGINE=InnoDB;

--- 1.7/mysql-test/r/rpl_row_log.result	2006-03-17 18:10:57 +01:00
+++ 1.8/mysql-test/r/rpl_row_log.result	2006-05-16 15:37:48 +02:00
@@ -39,6 +39,10 @@
 flush logs;
 create table t3 (a int)ENGINE=MyISAM;
 start slave;
+
+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
 flush logs;
 stop slave;
 create table t2 (n int)ENGINE=MyISAM;

--- 1.67/mysql-test/r/rpl_stm_log.result	2006-02-17 00:53:27 +01:00
+++ 1.68/mysql-test/r/rpl_stm_log.result	2006-05-16 15:37:39 +02:00
@@ -39,6 +39,10 @@
 flush logs;
 create table t3 (a int)ENGINE=MyISAM;
 start slave;
+
+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
 flush logs;
 stop slave;
 create table t2 (n int)ENGINE=MyISAM;

--- 1.36/mysql-test/extra/rpl_tests/rpl_log.test	2006-05-16 14:59:13 +02:00
+++ 1.37/mysql-test/extra/rpl_tests/rpl_log.test	2006-05-16 15:37:17 +02:00
@@ -77,12 +77,8 @@
 # to go into the relay log (the master always sends a fake one when replication
 # starts). 
 start slave;
---disable_query_log
---disable_result_log
 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
 sync_with_master;
 flush logs;
 stop slave;