summaryrefslogtreecommitdiff
path: root/BitKeeper
diff options
context:
space:
mode:
authorunknown <walrus@mysql.com>2002-11-05 00:26:45 +0500
committerunknown <walrus@mysql.com>2002-11-05 00:26:45 +0500
commit299cdd402a0e1b99f149b1d25f3f8f35930442b3 (patch)
treec90b22882f7e7b2683c35819684136aa5f90b2bc /BitKeeper
parent7312719905e2c2bccde6dd4fccc52d96d08e4582 (diff)
parent54ebb4175bc98d1ba2ca0e72abd83150d722ce8a (diff)
downloadmariadb-git-299cdd402a0e1b99f149b1d25f3f8f35930442b3.tar.gz
Merge akishkin@work.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/walrus/bk/40 BitKeeper/etc/gone: auto-union 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 8c51faa4411..ba06996cac1 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -14,6 +14,7 @@ bar@bar.udmsearch.izhnet.ru
bell@sanja.is.com.ua
bk@admin.bk
davida@isil.mysql.com
+gluh@gluh.(none)
heikki@donna.mysql.fi
heikki@hundin.mysql.fi
heikki@rescue.