Commit be6ad372 authored by dlenev@mysql.com's avatar dlenev@mysql.com

Merge mysql.com:/home/dlenev/src/mysql-5.0-bg11555-2

into  mysql.com:/home/dlenev/src/mysql-5.0-merges
parents c5c28741 e9e78290
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
#shift #shift
FROM=$USER@mysql.com FROM=$USER@mysql.com
INTERNALS=internals@lists.mysql.com COMMITS=commits@lists.mysql.com
DOCS=docs-commit@mysql.com DOCS=docs-commit@mysql.com
LIMIT=10000 LIMIT=10000
VERSION="5.0" VERSION="5.0"
...@@ -61,14 +61,14 @@ EOF ...@@ -61,14 +61,14 @@ EOF
) | /usr/sbin/sendmail -t ) | /usr/sbin/sendmail -t
#++ #++
# internals@ mail # commits@ mail
#-- #--
echo "Notifying internals list at $INTERNALS" echo "Notifying commits list at $COMMITS"
( (
cat <<EOF cat <<EOF
List-ID: <bk.mysql-$VERSION> List-ID: <bk.mysql-$VERSION>
From: $FROM From: $FROM
To: $INTERNALS To: $COMMITS
Subject: bk commit into $VERSION tree ($CHANGESET)$BS Subject: bk commit into $VERSION tree ($CHANGESET)$BS
X-CSetKey: <$CSETKEY> X-CSetKey: <$CSETKEY>
$BH $BH
......
...@@ -7,7 +7,7 @@ AC_INIT(sql/mysqld.cc) ...@@ -7,7 +7,7 @@ AC_INIT(sql/mysqld.cc)
AC_CANONICAL_SYSTEM AC_CANONICAL_SYSTEM
# The Docs Makefile.am parses this line! # The Docs Makefile.am parses this line!
# remember to also change ndb version below and update version.c in ndb # remember to also change ndb version below and update version.c in ndb
AM_INIT_AUTOMAKE(mysql, 5.0.17) AM_INIT_AUTOMAKE(mysql, 5.0.18)
AM_CONFIG_HEADER(config.h) AM_CONFIG_HEADER(config.h)
PROTOCOL_VERSION=10 PROTOCOL_VERSION=10
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment