bk commit into 5.1 tree (jmiller:1.2544)

[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-04-23 19:43:52+02:00, jmiller@stripped +1 -0
  rpl_ndb_stm_innodb.test:
    updated to use diff_files instead of --exec diff

  mysql-test/t/rpl_ndb_stm_innodb.test@stripped, 2007-04-23 19:43:42+02:00, jmiller@stripped
+1 -7
    updated to use diff_files instead of --exec diff

# 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-telco2

--- 1.5/mysql-test/t/rpl_ndb_stm_innodb.test	2007-04-23 19:44:03 +02:00
+++ 1.6/mysql-test/t/rpl_ndb_stm_innodb.test	2007-04-23 19:44:03 +02:00
@@ -250,14 +250,8 @@
 
 --echo ****** Do dumps compare ************
 
---exec diff $MYSQLTEST_VARDIR/tmp/master_apply_status.sql
$MYSQLTEST_VARDIR/tmp/slave_apply_status.sql;
 
-#Note: other tests are using diff_files, but I could not get the test framework to 
-#      work using it, so I went back to using 11exec diff. In the future
-#      once all clones work with diff_files, this test should be altered to
-#      use it.
-
-#diff_files $MYSQLTEST_VARDIR/tmp/master_apply_status.sql
$MYSQLTEST_VARDIR/tmp/slave_apply_status.sql;
+diff_files $MYSQLTEST_VARDIR/tmp/master_apply_status.sql
$MYSQLTEST_VARDIR/tmp/slave_apply_status.sql;
 
 ## Note: Ths files should only get removed, if the above diff succeeds.