summaryrefslogtreecommitdiff
path: root/BitKeeper
diff options
context:
space:
mode:
authorunknown <vva@eagle.mysql.r18.ru>2002-12-14 02:18:58 +0400
committerunknown <vva@eagle.mysql.r18.ru>2002-12-14 02:18:58 +0400
commitb3d9826b5a17cdbdef4104a0ac3a2fe1279e8fbc (patch)
treef20247310a8c891d529e5aa1b743e391c312f6ec /BitKeeper
parentdaeed63662488d47389df44ff2d64947127c9257 (diff)
parentcaf1bf0ad0a904036300220b21035112bde002e3 (diff)
downloadmariadb-git-b3d9826b5a17cdbdef4104a0ac3a2fe1279e8fbc.tar.gz
Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/4.1
into eagle.mysql.r18.ru:/home/vva/work/SOUNDS_LIKE/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 89391563f72..15f884302a1 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -90,6 +90,7 @@ tonu@x153.internalnet
tonu@x3.internalnet
venu@myvenu.com
venu@work.mysql.com
+vva@eagle.mysql.r18.ru
vva@genie.(none)
walrus@mysql.com
wax@mysql.com