Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/winbkfix/my50-winbkfix

into  rolltop.ignatz42.dyndns.org:/mnt/storeage/winbkfix/my51-winbkfix


BitKeeper/etc/ignore:
  auto-union
BitKeeper/triggers/post-commit:
  Manual merge.  Opted for the method that uses temp files for improved troubleshooting.

.bzrignore

@@ -5,6 +5,7 @@
 *.bb
 *.bbg
 *.bin
+*.cmake
 *.core
 *.d
 *.da
@@ -20,6 +21,7 @@
 *.map
 *.o
 *.obj
+*.old
 *.pch
 *.pdb
 *.reject
@@ -28,11 +30,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
@@ -68,6 +80,7 @@ BitKeeper/post-commit-manual
 BitKeeper/tmp/*
 BitKeeper/tmp/bkr3sAHD
 BitKeeper/tmp/gone
+CMakeFiles/*
 COPYING
 COPYING.LIB
 Docs/#manual.texi#
@@ -1685,6 +1698,7 @@ strings/ctype_autoconf.c
 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
@@ -1791,5 +1805,8 @@ vio/test-sslserver
 vio/viotest-ssl
 vio/viotest-sslconnect.cpp
 vio/viotest.cpp
+win/configure.data
+win/vs71cache.txt
+win/vs8cache.txt
 zlib/*.ds?
 zlib/*.vcproj

BitKeeper/triggers/post-commit

@@ -6,6 +6,7 @@ COMMITS=commits@lists.mysql.com
 DOCS=docs-commit@mysql.com
 LIMIT=10000
 VERSION="5.1"
+BKROOT=`bk root`
 
 if [ "$REAL_EMAIL" = "" ]
 then
@@ -14,12 +15,6 @@ else
  FROM=$REAL_EMAIL 
 fi
 
-if [ -x /usr/sbin/sendmail ]; then
-  SENDMAIL=/usr/sbin/sendmail
-else
-  SENDMAIL=sendmail
-fi
-
 BK_STATUS=$BK_STATUS$BK_COMMIT
 
 if [ "$BK_STATUS" = OK ]
@@ -64,7 +59,9 @@ $BH
 EOF
   bk changes -v -r+
   bk cset -r+ -d
- ) | $SENDMAIL -t
+ ) > $BKROOT/BitKeeper/tmp/dev_public.txt
+
+bk sendmail -t < $BKROOT/BitKeeper/tmp/dev_public.txt
 
 #++
 # commits@ mail
@@ -88,7 +85,9 @@ see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
 EOF
   bk changes -v -r+
   bk cset -r+ -d
- ) | head -n $LIMIT | $SENDMAIL -t
+ ) | bk sed -e ${LIMIT}q > $BKROOT/BitKeeper/tmp/commits.txt
+
+bk sendmail -t < $BKROOT/BitKeeper/tmp/commits.txt
 
 #++
 # docs-commit@ mail
@@ -108,7 +107,8 @@ Subject: bk commit - $VERSION tree (Manual) ($CHANGESET)$BS
 EOF
   bk changes -v -r+
   bk cset -r+ -d
- ) | $SENDMAIL -t
+ ) > $BKROOT/BitKeeper/tmp/docs.txt
+ bk sendmail -t < $BKROOT/BitKeeper/tmp/docs.txt
  fi
 
 else