summaryrefslogtreecommitdiff
path: root/BitKeeper
diff options
context:
space:
mode:
authorunknown <gbichot@quadxeon.mysql.com>2005-03-17 15:51:52 +0100
committerunknown <gbichot@quadxeon.mysql.com>2005-03-17 15:51:52 +0100
commit05534c4df038c95b03ec4341186d44e81610c4dd (patch)
tree4115e7ff17bcc9c67c8e3f90efbe930e4cde2fd7 /BitKeeper
parent7ceb5c6cef7c1b9bebe3869e9836035fbb177601 (diff)
parent93c928d3a75d388b7dd97fa8dc6edf294c69184e (diff)
downloadmariadb-git-05534c4df038c95b03ec4341186d44e81610c4dd.tar.gz
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into quadxeon.mysql.com:/nfstmp1/guilhem/mysql-4.0-4xeon 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 ef04f36c433..22f3d495f02 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -29,6 +29,7 @@ dellis@goetia.(none)
dlenev@brandersnatch.localdomain
dlenev@build.mysql.com
dlenev@mysql.com
+gbichot@quadxeon.mysql.com
gerberb@ou800.zenez.com
gluh@gluh.(none)
gluh@gluh.mysql.r18.ru