bk commit into 5.0 tree (iggy:1.2268)

[Ignacio Galarza]

Below is the list of changes that have just been committed into a local
5.0 repository of iggy. When iggy 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-09-13 13:48:34-04:00, iggy@stripped +1 -0
  Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/winbkfix/my50-winbkfix
  into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint
  MERGE: 1.2216.56.1

  BitKeeper/etc/ignore@stripped, 2006-09-13 13:48:28-04:00, iggy@stripped +10 -10
    auto-union
    MERGE: 1.227.2.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:	iggy
# Host:	rolltop.ignatz42.dyndns.org
# Root:	/mnt/storeage/mysql-5.0-maint/RESYNC

--- 1.230/BitKeeper/etc/ignore	2006-09-13 13:48:40 -04:00
+++ 1.231/BitKeeper/etc/ignore	2006-09-13 13:48:40 -04:00
@@ -4,6 +4,7 @@
 *.bb
 *.bbg
 *.bin
+*.cmake
 *.core
 *.d
 *.da
@@ -17,6 +18,7 @@
 *.map
 *.o
 *.obj
+*.old
 *.pch
 *.pdb
 *.reject
@@ -25,11 +27,21 @@
 *.so
 *.so.*
 *.spec
+*.user
+*.vcproj
+*/*.dir/*
 */*_pure_*warnings
 */.pure
+*/debug/*
+*/release/*
 *~
 .*.swp
+./CMakeCache.txt
+./MySql.ncb
+./MySql.sln
+./MySql.suo
 ./README.build-files
+./cmakecache.txt
 ./config.h
 ./copy_mysql_files.bat
 ./fix-project-files
@@ -65,6 +77,7 @@
 BitKeeper/tmp/*
 BitKeeper/tmp/bkr3sAHD
 BitKeeper/tmp/gone
+CMakeFiles/*
 COPYING
 COPYING.LIB
 Docs/#manual.texi#
@@ -1195,6 +1208,7 @@
 strings/ctype_extra_sources.c
 strings/str_test
 strings/test_decimal
+support-files/*.ini
 support-files/MacOSX/Description.plist
 support-files/MacOSX/Info.plist
 support-files/MacOSX/ReadMe.txt
@@ -1297,5 +1311,8 @@
 vio/viotest-ssl
 vio/viotest-sslconnect.cpp
 vio/viotest.cpp
+win/configure.data
+win/vs71cache.txt
+win/vs8cache.txt
 zlib/*.ds?
 zlib/*.vcproj