diff options
author | unknown <joreland@mysql.com> | 2004-09-20 17:25:55 +0200 |
---|---|---|
committer | unknown <joreland@mysql.com> | 2004-09-20 17:25:55 +0200 |
commit | 7df58b8cb3ea67dc5534b6e0488f29881fb4377a (patch) | |
tree | 38d6616cb283e118dd1795dbfab6cf3cec93e832 /BitKeeper | |
parent | 40880be36ac61b5ded7ca0ff555325c0fdf7eceb (diff) | |
parent | fd4761dfaccaf3268fc6ed477e40d16ca1a6c688 (diff) | |
download | mariadb-git-7df58b8cb3ea67dc5534b6e0488f29881fb4377a.tar.gz |
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/home/jonas/src/mysql-4.1-ndb
BitKeeper/etc/logging_ok:
auto-union
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 f72b47da651..cc4f31cf414 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 mleich@mysql.com @@ -130,6 +131,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 @@ -159,6 +161,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) |