Commit 10c66c6a authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 

into  mockturtle.local:/home/dlenev/src/mysql-5.0-rt-merge


BitKeeper/etc/collapsed:
  auto-union
mysql-test/mysql-test-run.pl:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
mysql-test/r/sp.result:
  Manual merge.
mysql-test/t/sp.test:
  Manual merge.
parents ca48fece c316933e

.bzrignore

+19 −0
Original line number Diff line number Diff line
@@ -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,23 @@ 
*.so

*.so.*

*.spec

*.user

*.vcproj

*/*.dir/*

*/*_pure_*warnings

*/.deps

*/.libs/*

*/.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 +79,7 @@ BitKeeper/post-commit-manual 
BitKeeper/tmp/*

BitKeeper/tmp/bkr3sAHD

BitKeeper/tmp/gone

CMakeFiles/*

COPYING

COPYING.LIB

Docs/#manual.texi#
@@ -1195,6 +1210,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
@@ -1297,5 +1313,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/etc/collapsed

+1 −0
Original line number Diff line number Diff line
@@ -4,3 +4,4 @@ 
44f33f3aj5KW5qweQeekY1LU0E9ZCg

45001f7c3b2hhCXDKfUvzkX9TNe6VA

45002051rHJfMEXAIMiAZV0clxvKSA

4513d8e4Af4dQWuk13sArwofRgFDQw

BitKeeper/etc/config

+1 −0
Original line number Diff line number Diff line
@@ -75,5 +75,6 @@ hours: 
[tomas:]checkout:get

[guilhem:]checkout:get

[pekka:]checkout:get

[msvensson:]checkout:get

checkout:edit

eoln:unix

BitKeeper/triggers/post-commit

+15 −3
Original line number Diff line number Diff line
@@ -6,6 +6,13 @@ COMMITS=commits@lists.mysql.com 
DOCS=docs-commit@mysql.com

LIMIT=10000

VERSION="5.0"

BKROOT=`bk root`



if [ -x /usr/sbin/sendmail ]; then

  SENDMAIL=/usr/sbin/sendmail

else

  SENDMAIL=sendmail

fi



if [ "$REAL_EMAIL" = "" ]

then
@@ -58,7 +65,9 @@ $BH 
EOF

  bk changes -v -r+

  bk cset -r+ -d

 ) | /usr/sbin/sendmail -t

 ) > $BKROOT/BitKeeper/tmp/dev_public.txt



$SENDMAIL -t < $BKROOT/BitKeeper/tmp/dev_public.txt



#++

# commits@ mail
@@ -82,7 +91,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 | /usr/sbin/sendmail -t

 ) | bk sed -e ${LIMIT}q > $BKROOT/BitKeeper/tmp/commits.txt



$SENDMAIL -t < $BKROOT/BitKeeper/tmp/commits.txt



#++

# docs-commit@ mail
@@ -102,7 +113,8 @@ Subject: bk commit - $VERSION tree (Manual) ($CHANGESET)$BS 
EOF

  bk changes -v -r+

  bk cset -r+ -d

 ) | /usr/sbin/sendmail -t

 ) > $BKROOT/BitKeeper/tmp/docs.txt

 $SENDMAIL -t < $BKROOT/BitKeeper/tmp/docs.txt

 fi



else

Docs/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


noinst_SCRIPTS =	Support/generate-text-files.pl



EXTRA_DIST =		$(noinst_SCRIPTS) mysql.info INSTALL-BINARY

EXTRA_DIST =		$(noinst_SCRIPTS) manual.chm mysql.info INSTALL-BINARY



TXT_FILES=		../INSTALL-SOURCE ../INSTALL-WIN-SOURCE ../EXCEPTIONS-CLIENT \

			INSTALL-BINARY ../support-files/MacOSX/ReadMe.txt