diff options
| author | unknown <ndbdev@eel.hemma.oreland.se> | 2004-08-05 22:19:52 +0200 |
|---|---|---|
| committer | unknown <ndbdev@eel.hemma.oreland.se> | 2004-08-05 22:19:52 +0200 |
| commit | e223c07eb18147b809cb885ca267ca43f4870701 (patch) | |
| tree | 682d9074ab3a5be1182ff2e58fe002059f0ddca1 /BitKeeper | |
| parent | 22306d0590f21ed8a43e92cee8fe591df4e88fe2 (diff) | |
| parent | ebe79c0b9bbb7bf03cd0ed15e474fed6d74adbff (diff) | |
| download | mariadb-git-e223c07eb18147b809cb885ca267ca43f4870701.tar.gz | |
Merge joreland@bk-internal.mysql.com:irix
into eel.hemma.oreland.se:/ndb/clone-mysql-4.1-ndb-daily-2004-08-04
BitKeeper/etc/logging_ok:
auto-union
ndb/src/common/debugger/signaldata/SignalDataPrint.cpp:
Auto merged
ndb/src/cw/cpcd/Process.cpp:
Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
ndb/src/kernel/blocks/dbtux/Dbtux.hpp:
Auto merged
ndb/src/kernel/blocks/dbtux/DbtuxMeta.cpp:
Auto merged
ndb/src/kernel/blocks/dbtux/DbtuxTree.cpp:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
ndb/test/ndbapi/testBasic.cpp:
Auto merged
ndb/test/run-test/main.cpp:
Auto merged
ndb/test/src/HugoTransactions.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
Diffstat (limited to 'BitKeeper')
| -rw-r--r-- | BitKeeper/etc/logging_ok | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index 48434c2e75a..f45647f87c6 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -127,6 +127,7 @@ mysql@home.(none) mysqldev@build.mysql2.com mysqldev@melody.local mysqldev@mysql.com +mysqldev@o2k.irixworld.net ndbdev@eel.hemma.oreland.se ndbdev@ndbmaster.mysql.com nick@mysql.com |