bk commit into 5.1 tree (jmiller:1.2095)

[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.2095 06/02/14 00:49:42 jmiller@stripped +2 -0
  Merge jmiller@stripped:/home/bk/mysql-5.1-new
  into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new

  mysql-test/t/rpl_loadfile.test
    1.4 06/02/14 00:49:34 jmiller@stripped +0 -0
    Auto merged

  mysql-test/t/disabled.def
    1.65 06/02/14 00:49:34 jmiller@stripped +0 -0
    Auto merged

# 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/RESYNC

--- 1.64/mysql-test/t/disabled.def	2006-02-13 16:45:48 +01:00
+++ 1.65/mysql-test/t/disabled.def	2006-02-14 00:49:34 +01:00
@@ -9,7 +9,6 @@
 #  Do not use any TAB characters for whitespace.
 #
 ##############################################################################
-archive              : Change between azio and gzio is causing an issue
 events               : Test case instability - infinite locking. To be fixed.
 func_group           : Bug#15448
 func_math            : Bug#15448

--- 1.3/mysql-test/t/rpl_loadfile.test	2006-02-09 15:29:33 +01:00
+++ 1.4/mysql-test/t/rpl_loadfile.test	2006-02-14 00:49:34 +01:00
@@ -43,8 +43,10 @@
 connection slave;
 SELECT * FROM test.t1 ORDER BY blob_column;
 
-# Lets cleanup
+# Cleanup
 connection master;
 DROP PROCEDURE IF EXISTS test.p1;
 DROP TABLE test.t1;
+sync_slave_with_master;
+
 # End of 5.0 test case