diff options
| author | unknown <lars@mysql.com> | 2005-04-19 11:09:54 +0200 |
|---|---|---|
| committer | unknown <lars@mysql.com> | 2005-04-19 11:09:54 +0200 |
| commit | 5f3052698663d741cea915e74ae180e5241d6c81 (patch) | |
| tree | 82617d0fcbec77f54df35f27b2a89108ac86b497 /BitKeeper/triggers | |
| parent | c0333ecee42a4de499b3377cfa21d7b5af1ddd2b (diff) | |
| parent | 9e7028c8e0708877fa802a1b589f695d78ccd1ea (diff) | |
| download | mariadb-git-5f3052698663d741cea915e74ae180e5241d6c81.tar.gz | |
Merging 5.0->5.1
BitKeeper/etc/logging_ok:
auto-union
BitKeeper/triggers/post-commit:
Auto merged
mysql-test/r/grant.result:
Auto merged
scripts/mysql_create_system_tables.sh:
Auto merged
scripts/mysql_fix_privilege_tables.sql:
Auto merged
sql/Makefile.am:
Auto merged
sql/log.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'BitKeeper/triggers')
| -rwxr-xr-x | BitKeeper/triggers/post-commit | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/BitKeeper/triggers/post-commit b/BitKeeper/triggers/post-commit index 4fbc0b2a9b8..e3f86fa995a 100755 --- a/BitKeeper/triggers/post-commit +++ b/BitKeeper/triggers/post-commit @@ -27,6 +27,7 @@ then fi CHANGESET=`bk -R prs -r+ -h -d':P:::I:' ChangeSet` +CSETKEY=`bk -R prs -r+ -h -d':KEY:' ChangeSet` BUG=`bk -R prs -r+ -h -d':C:' ChangeSet | sed -ne 's/^.*[Bb][Uu][Gg] *# *\([0-9][0-9]*\).*$/\1/p'` WL=`bk -R prs -r+ -h -d':C:' ChangeSet | sed -ne 's/^.*[Ww][Ll] *# *\([0-9][0-9]*\).*$/ WL#\1/p'` @@ -52,6 +53,7 @@ List-ID: <bk.mysql-$VERSION> From: $FROM To: $TO Subject: bk commit - $VERSION tree ($CHANGESET)${BS}${WL} +X-CSetKey: <$CSETKEY> $BH EOF bk changes -v -r+ @@ -68,6 +70,7 @@ List-ID: <bk.mysql-$VERSION> From: $FROM To: $INTERNALS Subject: bk commit into $VERSION tree ($CHANGESET)$BS +X-CSetKey: <$CSETKEY> $BH Below is the list of changes that have just been committed into a local $VERSION repository of $USER. When $USER does a push these changes will |