summaryrefslogtreecommitdiff
path: root/BitKeeper
diff options
context:
space:
mode:
authorunknown <mronstrom@mysql.com>2004-08-05 19:20:11 +0200
committerunknown <mronstrom@mysql.com>2004-08-05 19:20:11 +0200
commitcdca651f6dd2c5628bb4470b3b13368a2c8db8e1 (patch)
tree2373d7ef4aaf3bd81d346901704f9235875d3202 /BitKeeper
parent6c8df36263399a1df92ee5227d33f41cb3e1eedc (diff)
parentc0cc90c2e5574307e41d84426f2c0cbf0325fe2a (diff)
downloadmariadb-git-cdca651f6dd2c5628bb4470b3b13368a2c8db8e1.tar.gz
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/mikron/mysql-4.1 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 d24092e1a54..e80b459e6fb 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -84,6 +84,7 @@ joreland@mysql.com
jorge@linux.jorge.mysql.com
jplindst@t41.(none)
kaj@work.mysql.com
+kent@mysql.com
konstantin@mysql.com
kostja@oak.local
lenz@kallisto.mysql.com