summaryrefslogtreecommitdiff
path: root/BitKeeper/etc
diff options
context:
space:
mode:
authorunknown <bar@mysql.com>2005-05-06 13:08:28 +0500
committerunknown <bar@mysql.com>2005-05-06 13:08:28 +0500
commit61668218196b129c87e0b88946179c3cdd83af1b (patch)
tree3b3be2653b7fb89efb01892d851370d92ad1f99f /BitKeeper/etc
parentac3b760ff57e886f42c7428e8128a30eee800cde (diff)
parente5950cb1539b43dd5446ef95bd8734cca098eb14 (diff)
downloadmariadb-git-61668218196b129c87e0b88946179c3cdd83af1b.tar.gz
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/root/mysql-5.0 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 cc5ef79648b..ee552def442 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -244,6 +244,7 @@ serg@serg.mysql.com
serg@sergbook.mylan
serg@sergbook.mysql.com
sergefp@mysql.com
+shuichi@mysql.com
sinisa@rhols221.adsl.netsonic.fi
stewart@mysql.com
svoj@mysql.com