summaryrefslogtreecommitdiff
path: root/BitKeeper
diff options
context:
space:
mode:
authorunknown <wax@mysql.com>2003-07-31 04:17:42 +0600
committerunknown <wax@mysql.com>2003-07-31 04:17:42 +0600
commitff5372592d02c96046092a071d4abce0b9b0b62b (patch)
treee26f3cbc3aa0bfecfb4ac1a91180359edb839a2f /BitKeeper
parent2d413d3c6f39c549b3bed1cba30ad5e788a72719 (diff)
parentd4494c9f21a4650a9d82cd00d0bd7c7412c58d5e (diff)
downloadmariadb-git-ff5372592d02c96046092a071d4abce0b9b0b62b.tar.gz
Merge mysql.com:/home/wax/mysql/mysql-4.0
into mysql.com:/home/wax/mysql/mysql-4.0chsize 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 edb3f4141da..5cfac9730ab 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -112,6 +112,7 @@ vva@eagle.mysql.r18.ru
vva@genie.(none)
walrus@kishkin.ru
walrus@mysql.com
+wax@mysql.com
worm@altair.is.lan
zak@balfor.local
zak@linux.local