bk commit into 5.1 tree (cmiller:1.2284)

[Chad MILLER]

Below is the list of changes that have just been committed into a local
5.1 repository of cmiller. When cmiller 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, 2006-08-17 12:38:30-04:00, cmiller@stripped +3 -0
  Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1
  into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1-new-maint
  MERGE: 1.2273.1.13

  mysql-test/mysql-test-run.pl@stripped, 2006-08-17 12:30:39-04:00, cmiller@stripped +0 -0
    Auto merged
    MERGE: 1.150.2.1

  mysql-test/t/disabled.def@stripped, 2006-08-17 12:38:28-04:00, cmiller@stripped +0 -0
    SCCS merged
    MERGE: 1.186.1.1

  mysql-test/t/mysql.test@stripped, 2006-08-17 12:30:39-04:00, cmiller@stripped +0 -0
    Auto merged
    MERGE: 1.14.1.1

# 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:	cmiller
# Host:	zippy.cornsilk.net
# Root:	/home/cmiller/work/mysql/merge/mysql-5.1-new-maint/RESYNC

--- 1.187/mysql-test/t/disabled.def	2006-08-17 12:38:35 -04:00
+++ 1.188/mysql-test/t/disabled.def	2006-08-17 12:38:35 -04:00
@@ -45,3 +45,4 @@
 rpl_truncate_7ndb        : BUG#21298 2006-07-27 msvensson
 crash_commit_before      : 2006-08-02 msvensson
 rpl_ndb_dd_advance       : BUG#18679 2006-07-28 jimw (Test fails randomly)
+partition                : BUG#21658 2006-08-17 azundris  fails w/ --ps-protocol