diff options
| author | unknown <ndbdev@dl145b.mysql.com> | 2005-06-14 00:05:27 +0200 |
|---|---|---|
| committer | unknown <ndbdev@dl145b.mysql.com> | 2005-06-14 00:05:27 +0200 |
| commit | 7bb5fe94115329ba179c59d30b4cff60823b16a4 (patch) | |
| tree | 57430419848f0b4ed26d8c02853b7eaa63fbe1fe /BitKeeper | |
| parent | 1a0bddb84d5c93af339e7c5ce1a45c7cbde59071 (diff) | |
| parent | 91a7d4e737455b4eed9185ebf622626e982bd8ad (diff) | |
| download | mariadb-git-7bb5fe94115329ba179c59d30b4cff60823b16a4.tar.gz | |
merge
BitKeeper/etc/logging_ok:
auto-union
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
sql/item_cmpfunc.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 3d4c3d60ca8..e9cc35b4c7e 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -197,6 +197,7 @@ mysqldev@melody.local mysqldev@mysql.com mysqldev@o2k.irixworld.net ndbdev@dl145b.mysql.com +ndbdev@dl145c.mysql.com ndbdev@eel.hemma.oreland.se ndbdev@ndbmaster.mysql.com ndbdev@shark. |