summaryrefslogtreecommitdiff
path: root/BitKeeper/etc
diff options
context:
space:
mode:
authorunknown <ndbdev@ndbmaster.mysql.com>2004-05-11 22:26:10 +0200
committerunknown <ndbdev@ndbmaster.mysql.com>2004-05-11 22:26:10 +0200
commit4ea1e89755f8febec25a61e21271f40dc3b5f06d (patch)
treeb8f6b85bfe5280d4683e9b96e1ec530076f63f83 /BitKeeper/etc
parentb405bdc9f3d3741b8e4025b92d6c9fd7c6677e53 (diff)
parentc8875d5693b628b373e46762a752238ae6a15527 (diff)
downloadmariadb-git-4ea1e89755f8febec25a61e21271f40dc3b5f06d.tar.gz
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into ndbmaster.mysql.com:/ndb/clone-4.1-ndb-daily BitKeeper/etc/logging_ok: auto-union
Diffstat (limited to 'BitKeeper/etc')
-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 33575e92d72..c89c60287fd 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -112,6 +112,7 @@ mwagner@work.mysql.com
mydev@mysql.com
mysql@home.(none)
mysqldev@build.mysql2.com
+ndbdev@ndbmaster.mysql.com
nick@mysql.com
nick@nick.leippe.com
papa@gbichot.local