summaryrefslogtreecommitdiff
path: root/BitKeeper
diff options
context:
space:
mode:
authorunknown <igor@rurik.mysql.com>2003-06-12 06:20:11 -0700
committerunknown <igor@rurik.mysql.com>2003-06-12 06:20:11 -0700
commit2aab83ccdfc3626808882df4f08e2113f2d52f6d (patch)
tree9950f4bf15af78d0e5ca805bdb5f8fed648dfffd /BitKeeper
parentedd9bd53f1b302e5ca540c103585a0fc3e0aeee0 (diff)
parent767f0a9f0e124667275a3a4f4a4874974444b842 (diff)
downloadmariadb-git-2aab83ccdfc3626808882df4f08e2113f2d52f6d.tar.gz
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1
into rurik.mysql.com:/home/igor/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 806eac52759..addcf06aa5f 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -34,6 +34,7 @@ hf@deer.(none)
hf@deer.mysql.r18.ru
hf@genie.(none)
igor@hundin.mysql.fi
+igor@rurik.mysql.com
jani@dsl-jkl1657.dial.inet.fi
jani@dsl-kpogw4gb5.dial.inet.fi
jani@hynda.(none)