summaryrefslogtreecommitdiff
path: root/BitKeeper
diff options
context:
space:
mode:
authorunknown <monty@mysql.com>2005-04-30 03:45:12 +0300
committerunknown <monty@mysql.com>2005-04-30 03:45:12 +0300
commit3b6043870d5764add22078f3785c059fe760e7f7 (patch)
tree04e7d5494ac5e82906a9d932fb8ae19502cb06c7 /BitKeeper
parent97b0821462cd21d5051b3264f072ea3d4a7a8d7f (diff)
parentf8e45de365d50181a32a6b17106f0c91441766fe (diff)
downloadmariadb-git-3b6043870d5764add22078f3785c059fe760e7f7.tar.gz
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1 sql/sql_select.cc: Auto merged
Diffstat (limited to 'BitKeeper')
-rw-r--r--BitKeeper/etc/logging_ok2
1 files changed, 2 insertions, 0 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index e4de8c6ebf2..330d28daf52 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -45,6 +45,8 @@ dlenev@build.mysql.com
dlenev@jabberwock.localdomain
dlenev@mysql.com
ejonore@mc03.ndb.mysql.com
+evgen@moonbone.(none)
+evgen@moonbone.local
gbichot@quadita2.mysql.com
gbichot@quadxeon.mysql.com
georg@beethoven.local