summaryrefslogtreecommitdiff
path: root/BitKeeper
diff options
context:
space:
mode:
authorunknown <mwagner@ultrafly.mysql.com>2005-05-08 19:16:37 +0200
committerunknown <mwagner@ultrafly.mysql.com>2005-05-08 19:16:37 +0200
commit1923ddea2edb28760960c242fab003848893ce04 (patch)
tree1fd8ae90ee37fb97ba04c84af3cf677410e05702 /BitKeeper
parentbee950bd8360b867c3f191dc0548a85695190625 (diff)
parent1a4fd96bd576601bfea09a61a98ee45fee417513 (diff)
downloadmariadb-git-1923ddea2edb28760960c242fab003848893ce04.tar.gz
Merge bk-internal:/home/bk/mysql-4.1
into ultrafly.mysql.com:/Users/mwagner/work/bk/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 ac7413062d6..2143d0f2492 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -162,6 +162,7 @@ mwagner@cash.mwagner.org
mwagner@evoq.mwagner.org
mwagner@here.mwagner.org
mwagner@mysql.com
+mwagner@ultrafly.mysql.com
mwagner@work.mysql.com
mydev@mysql.com
mysql@home.(none)