diff options
| author | unknown <mysql@mc04.(none)> | 2004-09-16 09:21:49 +0200 |
|---|---|---|
| committer | unknown <mysql@mc04.(none)> | 2004-09-16 09:21:49 +0200 |
| commit | d159d111da398b1b1ed59a56f2357692bf2a8ab1 (patch) | |
| tree | 4607d1174b87192db3af2f5f44ecde3190fb6e87 /BitKeeper | |
| parent | 149b45b8f3773dbe727dcad2a81714c0a84c9576 (diff) | |
| parent | 49dc3a53011fde94b900762084cd0631cb4fb24a (diff) | |
| download | mariadb-git-d159d111da398b1b1ed59a56f2357692bf2a8ab1.tar.gz | |
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mc04.(none):/space/mysql/mysql-4.1-ndb
acinclude.m4:
Auto merged
configure.in:
Auto merged
ndb/src/common/transporter/TransporterRegistry.cpp:
Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
sql/Makefile.am:
Auto merged
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
Diffstat (limited to 'BitKeeper')
| -rw-r--r-- | BitKeeper/etc/logging_ok | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index c3ca14ab929..94ba59159ca 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -100,6 +100,7 @@ miguel@hegel.txg.br miguel@light. miguel@light.local miguel@sartre.local +mikael@mc04.(none) mikron@c-fb0ae253.1238-1-64736c10.cust.bredbandsbolaget.se mikron@mikael-ronstr-ms-dator.local mmatthew@markslaptop. @@ -129,6 +130,7 @@ mwagner@here.mwagner.org mwagner@work.mysql.com mydev@mysql.com mysql@home.(none) +mysql@mc04.(none) mysqldev@build.mysql2.com mysqldev@melody.local mysqldev@mysql.com @@ -158,6 +160,7 @@ ram@ram.(none) ranger@regul.home.lan rburnett@build.mysql.com root@home.(none) +root@mc04.(none) root@x3.internalnet salle@banica.(none) salle@geopard.(none) |