summaryrefslogtreecommitdiff
path: root/BitKeeper/etc
diff options
context:
space:
mode:
authorunknown <joreland@mysql.com>2004-12-18 11:49:15 +0100
committerunknown <joreland@mysql.com>2004-12-18 11:49:15 +0100
commit8f382c252f47ccc76863086cb5dd5ef8f2f619c7 (patch)
tree17d4ea7aff8950e4428677986160736bf2965665 /BitKeeper/etc
parent3863b25c7764388f9f584b1f1f1f3c7fc97cb3ae (diff)
parent632ad7c2d427c17798ce6a1027dc4a8a465bd850 (diff)
downloadmariadb-git-8f382c252f47ccc76863086cb5dd5ef8f2f619c7.tar.gz
merge
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 61590de940d..4df8c33212b 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -97,6 +97,7 @@ joerg@mysql.com
joreland@mysql.com
jorge@linux.jorge.mysql.com
jplindst@t41.(none)
+kaa@polly.local
kaj@work.mysql.com
kent@mysql.com
konstantin@mysql.com