summaryrefslogtreecommitdiff
path: root/BitKeeper/etc
diff options
context:
space:
mode:
authorunknown <ram@ram-book.(none)>2005-05-05 19:22:33 +0500
committerunknown <ram@ram-book.(none)>2005-05-05 19:22:33 +0500
commit5426d2efc74da13eee1a7f89e060114ffc7e2bf5 (patch)
tree907726bfc0df6b8a249107245daf719cda5c1ae8 /BitKeeper/etc
parentb6317e3ac0b756d28788ad686cfad4c513ea8cba (diff)
parent936c84989e9fb4307983ce6fa94e23d5cf29dab9 (diff)
downloadmariadb-git-5426d2efc74da13eee1a7f89e060114ffc7e2bf5.tar.gz
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into ram-book.(none):/home/ram/work/5.0 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 c7b5fa0f692..b1f34ac9002 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -219,6 +219,7 @@ ram@deer.(none)
ram@gw.mysql.r18.ru
ram@gw.udmsearch.izhnet.ru
ram@mysql.r18.ru
+ram@ram-book.(none)
ram@ram.(none)
ramil@mysql.com
ranger@regul.home.lan