summaryrefslogtreecommitdiff
path: root/BitKeeper
diff options
context:
space:
mode:
authorunknown <tulin@dl145c.mysql.com>2005-06-13 20:40:53 +0200
committerunknown <tulin@dl145c.mysql.com>2005-06-13 20:40:53 +0200
commit027360826228658ca58df7c04f65a7f7e4e283e6 (patch)
tree968d1c0082ef7a44f3a4f114736db10f4a5a4fa2 /BitKeeper
parente802cd3bc70833684e89913fa6e2828a6f80df79 (diff)
parent61962795f1b1a2af74fc590e058170465f6b73e0 (diff)
downloadmariadb-git-027360826228658ca58df7c04f65a7f7e4e283e6.tar.gz
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into dl145c.mysql.com:/home/ndbdev/tomas/mysql-4.1 BitKeeper/etc/logging_ok: auto-union
Diffstat (limited to 'BitKeeper')
-rw-r--r--BitKeeper/etc/logging_ok1
1 files changed, 1 insertions, 0 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index 717c9cd9261..71cdc892376 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -177,6 +177,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
nick@mysql.com