bk commit into 5.0 tree (cmiller:1.2422)

[Chad MILLER]

Below is the list of changes that have just been committed into a local
5.0 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, 2007-03-16 10:21:54-04:00, cmiller@stripped +1 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-5.0-comeng
  into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-comeng--no-profile-blockio
  MERGE: 1.2420.1.1

  BitKeeper/etc/collapsed@stripped, 2007-03-16 10:21:50-04:00, cmiller@stripped +2 -2
    auto-union
    MERGE: 1.26.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/mysql-5.0-comeng--no-profile-blockio/RESYNC

--- 1.27/BitKeeper/etc/collapsed	2007-03-16 10:21:58 -04:00
+++ 1.28/BitKeeper/etc/collapsed	2007-03-16 10:21:58 -04:00
@@ -63,3 +63,5 @@
 45ef08038kltrL-Enj7ZHHjUrrP9pw
 45ef09baRam62YBCkFyvTA3W5UjkAQ
 45ef1b9eATnZOX9zy-gNLBj7sUATpg
+45f9ab84xHMrqQgt-ynJHBGF8rXdxw
+45faa755P8fNxJEMpzfmnXk_5TquqA