diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-10-16 19:30:24 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-10-16 19:30:24 +0300 |
| commit | b3cb7b7f7742f691c9a14598e455b4ecb96f07e1 (patch) | |
| tree | fd68b42f3c1b7e47b36b19209daf540c3a0c7a68 /BitKeeper | |
| parent | 6f38e3083f0d867af8d1499fba92c7eaae295726 (diff) | |
| parent | aee5ef8516ce0599402ca8e8a6b72f3eca36739b (diff) | |
| download | mariadb-git-b3cb7b7f7742f691c9a14598e455b4ecb96f07e1.tar.gz | |
merge with 4.0.5
BitKeeper/etc/logging_ok:
auto-union
configure.in:
Auto merged
Docs/manual.texi:
Auto merged
myisam/mi_open.c:
Auto merged
mysql-test/r/null_key.result:
Auto merged
mysql-test/r/select.result:
Auto merged
sql/field.h:
Auto merged
sql/field_conv.cc:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/log.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/table.cc:
Auto merged
Diffstat (limited to 'BitKeeper')
| -rw-r--r-- | BitKeeper/etc/logging_ok | 5 | ||||
| -rwxr-xr-x | BitKeeper/triggers/post-commit | 14 |
2 files changed, 12 insertions, 7 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index 851a8f4be33..ed35a998fb7 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -4,6 +4,7 @@ Administrator@co3064164-a.rochd1.qld.optushome.com.au Administrator@fred. Miguel@light.local Sinisa@sinisa.nasamreza.org +WAX@sergbook.mysql.com ahlentz@co3064164-a.rochd1.qld.optusnet.com.au akishkin@work.mysql.com arjen@co3064164-a.bitbike.com @@ -11,6 +12,7 @@ arjen@fred.bitbike.com arjen@george.bitbike.com bar@bar.mysql.r18.ru bar@bar.udmsearch.izhnet.ru +bar@gw.udmsearch.izhnet.ru bell@sanja.is.com.ua davida@isil.mysql.com heikki@donna.mysql.fi @@ -57,6 +59,8 @@ paul@teton.kitebird.com pem@mysql.com peter@linux.local peter@mysql.com +ram@gw.udmsearch.izhnet.ru +ram@mysql.r18.ru ram@ram.(none) root@x3.internalnet salle@geopard.(none) @@ -80,6 +84,7 @@ tonu@hundin.mysql.fi tonu@volk.internalnet tonu@x153.internalnet tonu@x3.internalnet +venu@myvenu.com venu@work.mysql.com vva@genie.(none) walrus@mysql.com diff --git a/BitKeeper/triggers/post-commit b/BitKeeper/triggers/post-commit index 50562ba5cc9..f8ab599fc98 100755 --- a/BitKeeper/triggers/post-commit +++ b/BitKeeper/triggers/post-commit @@ -25,10 +25,10 @@ then echo "Commit successful, notifying developers at $TO" ( cat <<EOF -List-ID: <bk.mysql-4.0> +List-ID: <bk.mysql-4.1> From: $FROM To: $TO -Subject: bk commit - 4.0 tree +Subject: bk commit - 4.1 tree EOF bk changes -v -r+ @@ -41,13 +41,13 @@ EOF echo "Notifying internals list at $INTERNALS" ( cat <<EOF -List-ID: <bk.mysql-4.0> +List-ID: <bk.mysql-4.1> From: $FROM To: $INTERNALS -Subject: bk commit into 4.0 tree +Subject: bk commit into 4.1 tree Below is the list of changes that have just been committed into a local -4.0 repository of $USER. When $USER does a push these changes will +4.1 repository of $USER. When $USER does a push these changes will be propagated to the main repository and, within 24 hours after the push, to the public repository. For information on how to access the public repository @@ -68,10 +68,10 @@ EOF echo "Notifying docs list at $DOCS" ( cat <<EOF -List-ID: <bk.mysql-4.0> +List-ID: <bk.mysql-4.1> From: $FROM To: $DOCS -Subject: bk commit - 4.0 tree (Manual) +Subject: bk commit - 4.1 tree (Manual) EOF bk changes -v -r+ |