summaryrefslogtreecommitdiff
path: root/BitKeeper
diff options
context:
space:
mode:
authorunknown <mronstrom@mysql.com>2004-05-18 16:46:25 +0200
committerunknown <mronstrom@mysql.com>2004-05-18 16:46:25 +0200
commitc77f7ab112d140e6cc5deb08b3ae5a608d304187 (patch)
treee38d7c429b9c5071ab04b7c1156f5588a7ed7b49 /BitKeeper
parent5ab40f3a7db7254841efc41648e18807d8037f0d (diff)
parentd6cf9dd9b7dd3935373c54b69d2c7db21c8f29cd (diff)
downloadmariadb-git-c77f7ab112d140e6cc5deb08b3ae5a608d304187.tar.gz
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/Users/mikron/patch_cluster 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 c50e3e7ff4e..af1c31cc327 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -122,6 +122,7 @@ paul@ice.local
paul@ice.snake.net
paul@kite-hub.kitebird.com
paul@teton.kitebird.com
+pekka@mysql.com
pem@mysql.com
peter@linux.local
peter@mysql.com