diff options
| author | unknown <tulin@build.mysql.com> | 2004-05-10 17:40:57 +0200 |
|---|---|---|
| committer | unknown <tulin@build.mysql.com> | 2004-05-10 17:40:57 +0200 |
| commit | 806a06fdbdc19edd596a0b4c5ef54b1c546f5b20 (patch) | |
| tree | 808e79a60bd6ef6a37714172df3a6b1f8c06b1b3 /BitKeeper | |
| parent | 572899e0362f08755a82603a36a27628fb88a5d0 (diff) | |
| parent | 5edb391973f235890e3e6eb771e7d0fa3102b24a (diff) | |
| download | mariadb-git-806a06fdbdc19edd596a0b4c5ef54b1c546f5b20.tar.gz | |
merge resolve
extra/perror.c:
Auto merged
ndb/include/debugger/SignalLoggerManager.hpp:
Auto merged
ndb/include/ndb_version.h:
Auto merged
ndb/src/common/portlib/unix/NdbMem.c:
Auto merged
ndb/src/common/portlib/unix/NdbThread.c:
Auto merged
ndb/src/common/util/Parser.cpp:
Auto merged
ndb/src/common/util/getarg.c:
Auto merged
ndb/src/common/util/version.c:
Auto merged
ndb/src/kernel/blocks/backup/restore/Restore.cpp:
Auto merged
ndb/src/kernel/blocks/dbutil/DbUtil.cpp:
Auto merged
ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
Auto merged
ndb/src/kernel/ndb-main/Main.cpp:
Auto merged
ndb/src/mgmapi/test/keso.c:
Auto merged
ndb/src/mgmclient/test_cpcd/test_cpcd.cpp:
Auto merged
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
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 a8379b3d338..35ea9b2f778 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -163,6 +163,7 @@ tonu@hundin.mysql.fi tonu@volk.internalnet tonu@x153.internalnet tonu@x3.internalnet +tulin@build.mysql.com ulli@morbus.(none) venu@hundin.mysql.fi venu@myvenu.com |