summaryrefslogtreecommitdiff
path: root/BitKeeper
diff options
context:
space:
mode:
authorunknown <ramil@mysql.com>2005-02-04 15:53:14 +0400
committerunknown <ramil@mysql.com>2005-02-04 15:53:14 +0400
commitd3694db695be338cd157c2e1566acb7a3bf80fd9 (patch)
tree82eef17802554c0825d6a502088db3c703c16305 /BitKeeper
parentf2ebd8b11dd497ab7794922a87de67d3fcedd7ab (diff)
parent4c69539827f69a693236eca0a2f512b1618e80a1 (diff)
downloadmariadb-git-d3694db695be338cd157c2e1566acb7a3bf80fd9.tar.gz
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/home/ram/work/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 cfdb004723c..59882283d5d 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -181,6 +181,7 @@ ram@gw.mysql.r18.ru
ram@gw.udmsearch.izhnet.ru
ram@mysql.r18.ru
ram@ram.(none)
+ramil@mysql.com
ranger@regul.home.lan
rburnett@build.mysql.com
reggie@bob.(none)