summaryrefslogtreecommitdiff
path: root/BitKeeper
diff options
context:
space:
mode:
authorunknown <joreland@mysql.com>2004-12-31 09:51:57 +0100
committerunknown <joreland@mysql.com>2004-12-31 09:51:57 +0100
commitf8034fb99defd77c48927bab76894f5efe185e14 (patch)
tree6e3d126022a03cbdc4d951822adcdbd921022326 /BitKeeper
parentd11b52cde1aabebb1ee8d563b3a4e46d225e1ebf (diff)
parent01e04e13d15b4d78588865247faf09cd04deae06 (diff)
downloadmariadb-git-f8034fb99defd77c48927bab76894f5efe185e14.tar.gz
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0 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 523acd8bcef..a1e73620b73 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -235,6 +235,7 @@ ulli@morbus.(none)
venu@hundin.mysql.fi
venu@myvenu.com
venu@work.mysql.com
+vtkachenko@intelp4d.mysql.com
vva@eagle.mysql.r18.ru
vva@genie.(none)
vva@mysql.r18.ru