diff options
| author | unknown <joreland@mysql.com> | 2004-12-31 06:14:18 +0100 |
|---|---|---|
| committer | unknown <joreland@mysql.com> | 2004-12-31 06:14:18 +0100 |
| commit | 5df5f5c174299fc76e65e8273570f09090b41df5 (patch) | |
| tree | 5116ea21b23500f78f5ae5b33e504266f590fc0d /BitKeeper | |
| parent | 5bd46150a0d51bc38611796541ee5de8c347a3f9 (diff) | |
| parent | ee4c910422236fd376df0d9688ce0ca39f61fdfc (diff) | |
| download | mariadb-git-5df5f5c174299fc76e65e8273570f09090b41df5.tar.gz | |
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0
BitKeeper/etc/logging_ok:
auto-union
ndb/include/ndbapi/NdbDictionary.hpp:
Auto merged
ndb/src/common/util/Makefile.am:
Auto merged
ndb/src/kernel/blocks/backup/Backup.cpp:
Auto merged
ndb/src/kernel/blocks/backup/Backup.hpp:
Auto merged
ndb/src/kernel/blocks/backup/BackupInit.cpp:
Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
ndb/src/ndbapi/NdbDictionary.cpp:
Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
ndb/src/ndbapi/TransporterFacade.cpp:
Auto merged
ndb/src/ndbapi/TransporterFacade.hpp:
Auto merged
ndb/src/ndbapi/ndberror.c:
Auto merged
ndb/test/ndbapi/Makefile.am:
Auto merged
ndb/test/tools/Makefile.am:
Auto merged
ndb/tools/restore/restore_main.cpp:
Auto merged
Diffstat (limited to 'BitKeeper')
| -rw-r--r-- | BitKeeper/etc/logging_ok | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index 2ccacef641a..523acd8bcef 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -2,6 +2,7 @@ Administrador@light. Administrator@co3064164-a. Administrator@co3064164-a.rochd1.qld.optushome.com.au Administrator@fred. +Administrator@w2k. Greg@greg-laptop. Miguel@light.local Sinisa@sinisa.nasamreza.org @@ -43,6 +44,7 @@ dlenev@jabberwock.localdomain dlenev@mysql.com ejonore@mc03.ndb.mysql.com georg@beethoven.local +georg@beethoven.site gerberb@ou800.zenez.com gluh@gluh.(none) gluh@gluh.mysql.r18.ru @@ -108,6 +110,7 @@ magnus@neptunus.(none) magnus@shellback.(none) marko@hundin.mysql.fi mats@mysql.com +matt@booty.(none) matt@mysql.com matthias@three.local.lan miguel@hegel.(none) @@ -163,6 +166,7 @@ papa@gbichot.local patg@krsna.patg.net patg@patrick-galbraiths-computer.local paul@central.snake.net +paul@frost.snake.net paul@ice.local paul@ice.snake.net paul@kite-hub.kitebird.com |