diff options
| author | unknown <joreland@mysql.com> | 2004-12-06 14:52:31 +0100 |
|---|---|---|
| committer | unknown <joreland@mysql.com> | 2004-12-06 14:52:31 +0100 |
| commit | bf0b3493d695ec32814017be1f2da059b65982c0 (patch) | |
| tree | 3071885324d9cba2e6369bdea65d4d7f3c56ab03 /BitKeeper/etc | |
| parent | eb05d78dcb8074a5dfceedf8c86681531fc3bfbe (diff) | |
| parent | b1f4a482f4545999d6210aabdc2c0a80ee574374 (diff) | |
| download | mariadb-git-bf0b3493d695ec32814017be1f2da059b65982c0.tar.gz | |
Merge mysql.com:/home/jonas/src/mysql-4.1-fix
into mysql.com:/home/jonas/src/wl1744
BitKeeper/etc/logging_ok:
auto-union
configure.in:
Auto merged
ndb/include/Makefile.am:
Auto merged
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
Auto merged
ndb/src/common/util/version.c:
Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
Auto merged
ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
ndb/src/mgmsrv/main.cpp:
Auto merged
ndb/src/ndbapi/NdbConnection.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
Diffstat (limited to 'BitKeeper/etc')
| -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 36abd73fccf..10d00da552b 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -200,6 +200,7 @@ tim@siva.hindu.god tim@threads.polyesthetic.msg tim@white.box tim@work.mysql.com +timour@mysql.com tom@basil-firewall.home.com tomas@mc05.(none) tomas@poseidon.(none) |