diff options
| author | unknown <monty@work.mysql.com> | 2002-02-22 11:52:18 +0100 |
|---|---|---|
| committer | unknown <monty@work.mysql.com> | 2002-02-22 11:52:18 +0100 |
| commit | b569a092e9438219c730ce818891178525be49fc (patch) | |
| tree | 30a3ab8b8f7fbdeee768e27b2512df5a16479454 /BitKeeper | |
| parent | 64cad5180d75d7047c43a816f1d41e628a186759 (diff) | |
| parent | 229959ac2228cf1f25dc62276c30b608a50fd5a0 (diff) | |
| download | mariadb-git-b569a092e9438219c730ce818891178525be49fc.tar.gz | |
Merge work.mysql.com:/home/bk/mysql-4.0
into work.mysql.com:/home/bk/mysql-4.1
BitKeeper/etc/logging_ok:
auto-union
sql/sql_select.cc:
Auto merged
sql/sql_union.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'BitKeeper')
| -rw-r--r-- | BitKeeper/etc/logging_ok | 1 | ||||
| -rwxr-xr-x | BitKeeper/triggers/post-commit | 14 |
2 files changed, 8 insertions, 7 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index 1667ffe7e9c..f134ffcf5fb 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -5,6 +5,7 @@ Miguel@light.local Sinisa@sinisa.nasamreza.org ahlentz@co3064164-a.rochd1.qld.optusnet.com.au arjen@co3064164-a.bitbike.com +bar@gw.udmsearch.izhnet.ru bell@sanja.is.com.ua davida@isil.mysql.com heikki@donna.mysql.fi diff --git a/BitKeeper/triggers/post-commit b/BitKeeper/triggers/post-commit index 275c278f29d..bde60e84b3d 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 -4.0 repository of $USER. When $USER does a push, they will be propogated to +4.1 repository of $USER. When $USER does a push, they will be propogated to the main repository and within 24 hours after the push to the public repository. For information on how to access the public repository see http://www.mysql.com/doc/I/n/Installing_source_tree.html @@ -66,10 +66,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+ |