bk commit into 5.1 tree (jmiller:1.2537)

[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-06-13 22:28:44+02:00, jmiller@stripped +2 -0
  ndb_setup_slave.inc, rpl_ndb_dd_advance.test:
    Attempting to fix test failure in the telco clone. My guess got the one test passing and another failing. So I am moving the snyc of the slave from the include into the actual test file to see if I can make both tests happy

  mysql-test/include/ndb_setup_slave.inc@stripped, 2007-06-13 22:28:18+02:00, jmiller@stripped +1 -1
    Attempting to fix test failure in the telco clone. My guess got the one test passing and another failing. So I am moving the snyc of the slave from the include into the actual test file to see if I can make both tests happy

  mysql-test/t/rpl_ndb_dd_advance.test@stripped, 2007-06-13 22:28:28+02:00, jmiller@stripped +1 -0
    Attempting to fix test failure in the telco clone. My guess got the one test passing and another failing. So I am moving the snyc of the slave from the include into the actual test file to see if I can make both tests happy

# 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:	/data1/mysql-5.1-telco

--- 1.14/mysql-test/t/rpl_ndb_dd_advance.test	2007-06-13 22:28:56 +02:00
+++ 1.15/mysql-test/t/rpl_ndb_dd_advance.test	2007-06-13 22:28:56 +02:00
@@ -341,6 +341,7 @@
 --echo ***** Finsh the slave sync process *******
 --disable_query_log
 # 1. 2. 3.
+--sync_slave_with_master
 --source include/ndb_setup_slave.inc
 --enable_query_log
 

--- 1.4/mysql-test/include/ndb_setup_slave.inc	2007-06-13 22:28:56 +02:00
+++ 1.5/mysql-test/include/ndb_setup_slave.inc	2007-06-13 22:28:56 +02:00
@@ -5,7 +5,7 @@
 # 3. change master on slave
 
 # 1.
---sync_slave_with_master
+
 --connection slave
 --replace_column 1 <the_epoch>
 SELECT @the_epoch:=MAX(epoch) FROM mysql.ndb_apply_status;