diff options
| author | unknown <tim@work.mysql.com> | 2000-11-19 22:27:46 +0100 |
|---|---|---|
| committer | unknown <tim@work.mysql.com> | 2000-11-19 22:27:46 +0100 |
| commit | 22a61956da64790f713dd2089c099a7452dc0472 (patch) | |
| tree | 63979f3b3140516eb9b57d7b1738194c88c4cdc9 /BitKeeper | |
| parent | c9b16b81048d04260dc8e3ba43f218aa9ef5f06f (diff) | |
| parent | 0ca890bd19b5e71bf5540d852793479c32506571 (diff) | |
| download | mariadb-git-22a61956da64790f713dd2089c099a7452dc0472.tar.gz | |
Merge work.mysql.com:/home/bk/mysql
into work.mysql.com:/d1/users/tim/src/mysql
BitKeeper/etc/logging_ok:
auto-union
sql/ha_berkeley.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'BitKeeper')
| -rw-r--r-- | BitKeeper/etc/logging_ok | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index 5946f313d0c..437d68d72f8 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -1,8 +1,14 @@ jani@prima.mysql.com +jcole@tetra.bedford.progress.com +jcole@tetra.spaceapes.com monty@donna.mysql.com monty@narttu.mysql.fi +mwagner@evoq.home.mwagner.org mwagner@work.mysql.com +sasha@laptop.slkc.uswest.net sasha@mysql.sashanet.com +sasha@work.mysql.com serg@serg.mysql.com tim@threads.polyesthetic.msg +tim@work.mysql.com yfaktoro@nslinuxw2.bedford.progress.com |