mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 20:42:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/winbkfix/my51-winbkfix
This commit is contained in:
iggy@rolltop.ignatz42.dyndns.org 2006-09-13 14:16:53 -04:00
commit eb641f4a43
2 changed files with 26 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
.bzrignore
View file

@ -5,6 +5,7 @@
*.bb *.bb
*.bbg *.bbg
*.bin *.bin
*.cmake
*.core *.core
*.d *.d
*.da *.da
@ -20,6 +21,7 @@
*.map *.map
*.o *.o
*.obj *.obj
*.old
*.pch *.pch
*.pdb *.pdb
*.reject *.reject
@ -28,11 +30,21 @@
*.so *.so
*.so.* *.so.*
*.spec *.spec
*.user
*.vcproj
*/*.dir/*
*/*_pure_*warnings */*_pure_*warnings
*/.pure */.pure
*/debug/*
*/release/*
*~ *~
.*.swp .*.swp
./CMakeCache.txt
./MySql.ncb
./MySql.sln
./MySql.suo
./README.build-files ./README.build-files
./cmakecache.txt
./config.h ./config.h
./copy_mysql_files.bat ./copy_mysql_files.bat
./fix-project-files ./fix-project-files
@ -68,6 +80,7 @@ BitKeeper/post-commit-manual
BitKeeper/tmp/* BitKeeper/tmp/*
BitKeeper/tmp/bkr3sAHD BitKeeper/tmp/bkr3sAHD
BitKeeper/tmp/gone BitKeeper/tmp/gone
CMakeFiles/*
COPYING COPYING
COPYING.LIB COPYING.LIB
Docs/#manual.texi# Docs/#manual.texi#
@ -1685,6 +1698,7 @@ strings/ctype_autoconf.c
strings/ctype_extra_sources.c strings/ctype_extra_sources.c
strings/str_test strings/str_test
strings/test_decimal strings/test_decimal
support-files/*.ini
support-files/MacOSX/Description.plist support-files/MacOSX/Description.plist
support-files/MacOSX/Info.plist support-files/MacOSX/Info.plist
support-files/MacOSX/ReadMe.txt support-files/MacOSX/ReadMe.txt
@ -1791,5 +1805,8 @@ vio/test-sslserver
vio/viotest-ssl vio/viotest-ssl
vio/viotest-sslconnect.cpp vio/viotest-sslconnect.cpp
vio/viotest.cpp vio/viotest.cpp
win/configure.data
win/vs71cache.txt
win/vs8cache.txt
zlib/*.ds? zlib/*.ds?
zlib/*.vcproj zlib/*.vcproj

18
BitKeeper/triggers/post-commit
View file

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