diff options
| author | unknown <monty@mashka.mysql.fi> | 2002-12-05 19:38:42 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2002-12-05 19:38:42 +0200 |
| commit | 6d33f73416b5576b4e48412fd3a7342385c1c747 (patch) | |
| tree | 56f9dc35fe3c9e6c4f341e577ff3db68855d9e81 /BitKeeper | |
| parent | 930b3fa897112c49392c2154de1ec21b9e44edda (diff) | |
| parent | 9b5167eeac3e8d14134769334d94f260cb5db277 (diff) | |
| download | mariadb-git-6d33f73416b5576b4e48412fd3a7342385c1c747.tar.gz | |
Merge with 4.0.6
BitKeeper/etc/ignore:
auto-union
acinclude.m4:
Auto merged
configure.in:
Auto merged
heap/hp_delete.c:
Auto merged
heap/hp_scan.c:
Auto merged
include/my_base.h:
Auto merged
libmysql/libmysql.c:
Auto merged
libmysqld/lib_sql.cc:
Auto merged
myisam/mi_check.c:
Auto merged
myisam/mi_rnext_same.c:
Auto merged
myisam/sort.c:
Auto merged
mysql-test/r/alter_table.result:
Auto merged
mysql-test/r/distinct.result:
Auto merged
mysql-test/r/func_math.result:
Auto merged
mysql-test/r/group_by.result:
Auto merged
mysql-test/r/innodb.result:
Auto merged
mysql-test/r/select.result:
Auto merged
mysql-test/t/group_by.test:
Auto merged
mysql-test/t/select.test:
Auto merged
mysys/hash.c:
Auto merged
sql/field.h:
Auto merged
sql/field_conv.cc:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/log.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/opt_sum.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/set_var.h:
Auto merged
sql/sql_analyse.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_udf.cc:
Auto merged
sql/structs.h:
Auto merged
sql/uniques.cc:
Auto merged
strings/strto.c:
Auto merged
vio/vio.c:
Auto merged
BitKeeper/triggers/post-commit:
Add changeset to commit messages
sql-bench/crash-me.sh:
Use version from 4.0
sql-bench/server-cfg.sh:
Use version from 4.0
Diffstat (limited to 'BitKeeper')
| -rwxr-xr-x | BitKeeper/triggers/post-commit | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/BitKeeper/triggers/post-commit b/BitKeeper/triggers/post-commit index f8ab599fc98..a2a0ecb2701 100755 --- a/BitKeeper/triggers/post-commit +++ b/BitKeeper/triggers/post-commit @@ -19,6 +19,8 @@ BK_STATUS=$BK_STATUS$BK_COMMIT if [ "$BK_STATUS" = OK ] then +CHANGESET=`bk -R prs -r+ -h -d':I:' ChangeSet` + #++ # dev-public@ #-- @@ -28,7 +30,7 @@ then List-ID: <bk.mysql-4.1> From: $FROM To: $TO -Subject: bk commit - 4.1 tree +Subject: bk commit - 4.1 tree ($CHANGESET) EOF bk changes -v -r+ @@ -44,7 +46,7 @@ EOF List-ID: <bk.mysql-4.1> From: $FROM To: $INTERNALS -Subject: bk commit into 4.1 tree +Subject: bk commit into 4.1 tree ($CHANGESET) 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 @@ -71,7 +73,7 @@ EOF List-ID: <bk.mysql-4.1> From: $FROM To: $DOCS -Subject: bk commit - 4.1 tree (Manual) +Subject: bk commit - 4.1 tree (Manual) ($CHANGESET) EOF bk changes -v -r+ |