summaryrefslogtreecommitdiff
path: root/BitKeeper
diff options
context:
space:
mode:
authorunknown <mronstrom@mysql.com>2005-06-06 10:42:11 +0200
committerunknown <mronstrom@mysql.com>2005-06-06 10:42:11 +0200
commit93722fded286965225f729a7ad84e16402d7b1bb (patch)
tree89acc33b2d35b7f91ba4192b117d0f1d82b4604a /BitKeeper
parentef30cc61ca92848336d20bf6ed317477e8a17960 (diff)
parent26bd158216e600c5f7ec7eaec9007fa761ea5195 (diff)
downloadmariadb-git-93722fded286965225f729a7ad84e16402d7b1bb.tar.gz
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/Users/mikron/bug10901 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 185f84cc772..c2a093bb610 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -104,6 +104,7 @@ monty@tik.
monty@tik.mysql.fi
monty@tramp.mysql.fi
monty@work.mysql.com
+mronstrom@mysql.com
mwagner@cash.mwagner.org
mwagner@evoq.mwagner.org
mwagner@here.mwagner.org