Merge mysql.com:/home/pem/work/mysql-4.1
into mysql.com:/home/pem/work/mysql-5.0
This commit is contained in:
commit
3ec2f9656a
@ -6,6 +6,7 @@ FROM=$USER@mysql.com
|
|||||||
INTERNALS=internals@lists.mysql.com
|
INTERNALS=internals@lists.mysql.com
|
||||||
DOCS=docs-commit@mysql.com
|
DOCS=docs-commit@mysql.com
|
||||||
LIMIT=10000
|
LIMIT=10000
|
||||||
|
REPOV=5.0
|
||||||
|
|
||||||
if [ "$REAL_EMAIL" = "" ]
|
if [ "$REAL_EMAIL" = "" ]
|
||||||
then
|
then
|
||||||
@ -27,15 +28,15 @@ CHANGESET=`bk -R prs -r+ -h -d':I:' ChangeSet`
|
|||||||
echo "Commit successful, notifying developers at $TO"
|
echo "Commit successful, notifying developers at $TO"
|
||||||
(
|
(
|
||||||
cat <<EOF
|
cat <<EOF
|
||||||
List-ID: <bk.mysql-4.1>
|
List-ID: <bk.mysql-$REPOV>
|
||||||
From: $FROM
|
From: $FROM
|
||||||
To: $TO
|
To: $TO
|
||||||
Subject: bk commit - 4.1 tree ($CHANGESET)
|
Subject: bk commit - $REPOV tree ($CHANGESET)
|
||||||
|
|
||||||
EOF
|
EOF
|
||||||
bk changes -v -r+
|
bk changes -v -r+
|
||||||
bk cset -r+ -d
|
bk cset -r+ -d
|
||||||
) | head -n $LIMIT | /usr/sbin/sendmail -t
|
) | /usr/sbin/sendmail -t
|
||||||
|
|
||||||
#++
|
#++
|
||||||
# internals@ mail
|
# internals@ mail
|
||||||
@ -43,13 +44,13 @@ EOF
|
|||||||
echo "Notifying internals list at $INTERNALS"
|
echo "Notifying internals list at $INTERNALS"
|
||||||
(
|
(
|
||||||
cat <<EOF
|
cat <<EOF
|
||||||
List-ID: <bk.mysql-4.1>
|
List-ID: <bk.mysql-$REPOV>
|
||||||
From: $FROM
|
From: $FROM
|
||||||
To: $INTERNALS
|
To: $INTERNALS
|
||||||
Subject: bk commit into 4.1 tree ($CHANGESET)
|
Subject: bk commit into $REPOV tree ($CHANGESET)
|
||||||
|
|
||||||
Below is the list of changes that have just been committed into a local
|
Below is the list of changes that have just been committed into a local
|
||||||
4.1 repository of $USER. When $USER does a push these changes will
|
$REPOV repository of $USER. When $USER does a push these changes will
|
||||||
be propagated to the main repository and, within 24 hours after the
|
be propagated to the main repository and, within 24 hours after the
|
||||||
push, to the public repository.
|
push, to the public repository.
|
||||||
For information on how to access the public repository
|
For information on how to access the public repository
|
||||||
@ -70,15 +71,15 @@ EOF
|
|||||||
echo "Notifying docs list at $DOCS"
|
echo "Notifying docs list at $DOCS"
|
||||||
(
|
(
|
||||||
cat <<EOF
|
cat <<EOF
|
||||||
List-ID: <bk.mysql-4.1>
|
List-ID: <bk.mysql-$REPOV>
|
||||||
From: $FROM
|
From: $FROM
|
||||||
To: $DOCS
|
To: $DOCS
|
||||||
Subject: bk commit - 4.1 tree (Manual) ($CHANGESET)
|
Subject: bk commit - $REPOV tree (Manual) ($CHANGESET)
|
||||||
|
|
||||||
EOF
|
EOF
|
||||||
bk changes -v -r+
|
bk changes -v -r+
|
||||||
bk cset -r+ -d
|
bk cset -r+ -d
|
||||||
) | head -n $LIMIT | /usr/sbin/sendmail -t
|
) | /usr/sbin/sendmail -t
|
||||||
fi
|
fi
|
||||||
|
|
||||||
else
|
else
|
||||||
|
@ -4,7 +4,7 @@ dnl Process this file with autoconf to produce a configure script.
|
|||||||
AC_INIT(sql/mysqld.cc)
|
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!
|
||||||
AM_INIT_AUTOMAKE(mysql, 4.1.0-alpha)
|
AM_INIT_AUTOMAKE(mysql, 5.0.0-alpha)
|
||||||
AM_CONFIG_HEADER(config.h)
|
AM_CONFIG_HEADER(config.h)
|
||||||
|
|
||||||
PROTOCOL_VERSION=10
|
PROTOCOL_VERSION=10
|
||||||
|
Loading…
x
Reference in New Issue
Block a user