summaryrefslogtreecommitdiff
path: root/BitKeeper
diff options
context:
space:
mode:
authorunknown <ramil@mysql.com>2005-05-06 08:34:50 +0500
committerunknown <ramil@mysql.com>2005-05-06 08:34:50 +0500
commit97b7fbd4951536f31a0c2f3582316a10816becfe (patch)
tree6dfc0ea29309ef1a39fe91680d55a6e65b6df305 /BitKeeper
parent5426d2efc74da13eee1a7f89e060114ffc7e2bf5 (diff)
parenta3269ecf1c8fd5411467dc5b4e77cfdc1fffa6a8 (diff)
downloadmariadb-git-97b7fbd4951536f31a0c2f3582316a10816becfe.tar.gz
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/ram/work/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 b1f34ac9002..cc5ef79648b 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -82,6 +82,7 @@ hf@bisonxp.(none)
hf@deer.(none)
hf@deer.mysql.r18.ru
hf@genie.(none)
+holyfoot@mysql.com
igor@hundin.mysql.fi
igor@linux.local
igor@rurik.mysql.com