bk commit into 5.0 tree (cmiller:1.2398)

[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-01-31 16:14:12-05:00, cmiller@stripped +1 -0
  Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug25341/my50-bug25341
  into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
  MERGE: 1.2360.3.1

  BitKeeper/etc/collapsed@stripped, 2007-01-31 16:14:08-05:00, cmiller@stripped +1 -1
    auto-union
    MERGE: 1.19.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-maint/RESYNC

--- 1.23/BitKeeper/etc/collapsed	2007-01-31 16:14:18 -05:00
+++ 1.24/BitKeeper/etc/collapsed	2007-01-31 16:14:18 -05:00
@@ -30,6 +30,12 @@
 4554b3722d71SbPiI2Gx-RhbZjmuIQ
 4558b3d73Cxjlb7Wv1oytdSTthxDfw
 45771031yRCoM_ZfONdYchPvVEgLRg
+459a60d8rIxeTuhB3j_QsOwLGdcpng
+459a61c9OS8PzIsdviZJDkybJ1y1uA
+459a70691aYIfU2ohV0a3P5iTLpO2A
+459a7422KF_P7PuU3YQ5qG6ZLEVpiA
+459a74e4nRcXppMSBYeQQ5efDkTADg
 45ae6628gqKTsUFfnoNExadETVIkbA
 45ba4faf2oqu6eR8fqecR3LfSNcYUg
 45ba5238-NKl80QVXzdGo8hO9M75Xg
+45c0fdfb2mz6NdOIsLenJtf6_ZelTA