diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-08-10 17:47:05 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-08-10 17:47:05 +0300 |
| commit | 73e86d62dedbf29fe76cc05270e6245432206201 (patch) | |
| tree | cafcb1d0d2a42df1417e331bc30c6c6e12c78cc9 /BitKeeper | |
| parent | c0dbd4d9811e4c2433cd651d34bd5c6af72f5593 (diff) | |
| parent | aa3c4306754c3db0c2ea3a6db0cffcb6bc1ed0f7 (diff) | |
| download | mariadb-git-73e86d62dedbf29fe76cc05270e6245432206201.tar.gz | |
merge
BitKeeper/etc/logging_ok:
auto-union
innobase/buf/buf0flu.c:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
Docs/manual.texi:
Will merge later..
Diffstat (limited to 'BitKeeper')
| -rw-r--r-- | BitKeeper/etc/logging_ok | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index 649ea4cac52..ae00a4e6013 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -1,5 +1,20 @@ +davida@isil.mysql.com heikki@donna.mysql.fi jani@hynda.mysql.fi +jani@janikt.pp.saunalahti.fi jcole@tetra.spaceapes.com -tim@work.mysql.com +miguel@light.local +monty@bitch.mysql.fi +monty@hundin.mysql.fi +monty@tik.mysql.fi +monty@work.mysql.com +mwagner@evoq.mwagner.org +paul@central.snake.net +paul@teton.kitebird.com +sasha@mysql.sashanet.com serg@serg.mysql.com +tim@bitch.mysql.fi +tim@threads.polyesthetic.msg +tim@white.box +tim@work.mysql.com +tonu@x153.internalnet |