bk commit into 5.1 tree (jmiller:1.2521)

[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 18:04:37+02:00, jmiller@stripped +1 -0
  ndb_setup_slave.inc:
    Attempting to fix test failure in the telco clone. This is just kind of a guess as I
am not getting failures locally

  mysql-test/include/ndb_setup_slave.inc@stripped, 2007-06-13 18:04:11+02:00, jmiller@stripped
+1 -0
    Attempting to fix test failure in the telco clone. This is just kind of a guess as I
am not getting failures locally

# 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.3/mysql-test/include/ndb_setup_slave.inc	2007-06-13 18:04:48 +02:00
+++ 1.4/mysql-test/include/ndb_setup_slave.inc	2007-06-13 18:04:48 +02:00
@@ -5,6 +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;