summaryrefslogtreecommitdiff
path: root/BitKeeper
diff options
context:
space:
mode:
authorunknown <sasha@mysql.sashanet.com>2000-11-16 23:00:18 -0700
committerunknown <sasha@mysql.sashanet.com>2000-11-16 23:00:18 -0700
commit645cfcb142a0a2532a180106308163a613f323ca (patch)
tree25147cf317bec2a66e2ce47de3053e915c034590 /BitKeeper
parent02e6c9634ded99db7fce9844723c3115c0cfc2a4 (diff)
parent3d057360572d95252c370901f8bac55fbf137ebe (diff)
downloadmariadb-git-645cfcb142a0a2532a180106308163a613f323ca.tar.gz
Merge work.mysql.com:/home/bk/mysql
into mysql.sashanet.com:/home/sasha/src/bk/mysql 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 f3ef9f298a8..328eb654350 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -1,4 +1,5 @@
monty@donna.mysql.com
monty@narttu.mysql.fi
+mwagner@work.mysql.com
sasha@mysql.sashanet.com
serg@serg.mysql.com