summaryrefslogtreecommitdiff
path: root/BitKeeper
diff options
context:
space:
mode:
authorunknown <timour@mysql.com>2004-11-25 13:25:35 +0200
committerunknown <timour@mysql.com>2004-11-25 13:25:35 +0200
commita67c64c2effa0466c41e6c022193e9583187ee8a (patch)
treeb06a0495934dc459a552dadc38cb32f6c43114da /BitKeeper
parent84c8cec750efb63ea2dd29c93e477b282af6a582 (diff)
parent99ef45cbeb224da15366f7b4f40a3cf3b14f6107 (diff)
downloadmariadb-git-a67c64c2effa0466c41e6c022193e9583187ee8a.tar.gz
Merge mysql.com:/home/timka/mysql/src/4.0-virgin
into mysql.com:/home/timka/mysql/src/4.0-master 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 241b050d8f9..e8b795c4d80 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -72,6 +72,7 @@ kostja@oak.local
lenz@kallisto.mysql.com
lenz@mysql.com
marko@hundin.mysql.fi
+mats@mysql.com
matt@mysql.com
miguel@hegel.(none)
miguel@hegel.br