diff options
| author | unknown <tomas@poseidon.(none)> | 2004-05-21 00:00:34 +0000 |
|---|---|---|
| committer | unknown <tomas@poseidon.(none)> | 2004-05-21 00:00:34 +0000 |
| commit | 419464281344c2a751ab3780c61d7611afd731a3 (patch) | |
| tree | 6b6d0125c75c753a311f5c4caa1c798096633649 /BitKeeper | |
| parent | 0d6b5946d019630145c370373871d229379e71dd (diff) | |
| parent | ee0732603e811234dd14fd21b041b3330e532658 (diff) | |
| download | mariadb-git-419464281344c2a751ab3780c61d7611afd731a3.tar.gz | |
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.(none):/home/tomas/mysql-4.1-ndb
ndb/src/kernel/ndb-main/Main.cpp:
Auto merged
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
Diffstat (limited to 'BitKeeper')
| -rw-r--r-- | BitKeeper/etc/logging_ok | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index 1c51ce68476..88ec249a725 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -107,6 +107,7 @@ monty@tik.mysql.fi monty@tramp.mysql.fi monty@work.mysql.com mronstrom@mysql.com +msvensson@build.mysql.com mwagner@cash.mwagner.org mwagner@evoq.mwagner.org mwagner@work.mysql.com @@ -163,6 +164,7 @@ tim@white.box tim@work.mysql.com tom@basil-firewall.home.com tomas@mc05.(none) +tomas@poseidon.(none) tonu@hundin.mysql.fi tonu@volk.internalnet tonu@x153.internalnet |