summaryrefslogtreecommitdiff
path: root/BitKeeper
diff options
context:
space:
mode:
authorunknown <serg@sergbook.mysql.com>2002-05-14 18:00:06 +0200
committerunknown <serg@sergbook.mysql.com>2002-05-14 18:00:06 +0200
commitac6c4f6cb7f9f9523408439048cc82da1a6b8a07 (patch)
tree528ac112a364610fa3a495cbb5a0113a97561c42 /BitKeeper
parentb2a96dd8842b888e545d5fed33dfb7edf67cd11f (diff)
parent4b4b955e5fedf33011f381f3bc90cfb464bb2843 (diff)
downloadmariadb-git-ac6c4f6cb7f9f9523408439048cc82da1a6b8a07.tar.gz
Merge work:/home/bk/mysql-4.0
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.0 BitKeeper/etc/logging_ok: auto-union
Diffstat (limited to 'BitKeeper')
-rw-r--r--BitKeeper/etc/logging_ok3
1 files changed, 2 insertions, 1 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index fed3d7fd276..b432698b1ff 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -11,6 +11,7 @@ bell@sanja.is.com.ua
davida@isil.mysql.com
heikki@donna.mysql.fi
heikki@hundin.mysql.fi
+jani@dsl-jkl1657.dial.inet.fi
jani@hynda.mysql.fi
jani@janikt.pp.saunalahti.fi
jani@rhols221.adsl.netsonic.fi
@@ -40,6 +41,7 @@ paul@teton.kitebird.com
root@x3.internalnet
sasha@mysql.sashanet.com
serg@serg.mysql.com
+serg@sergbook.mysql.com
sinisa@rhols221.adsl.netsonic.fi
tfr@sarvik.tfr.cafe.ee
tim@bitch.mysql.fi
@@ -56,4 +58,3 @@ tonu@x3.internalnet
venu@work.mysql.com
zak@balfor.local
zak@linux.local
-jani@dsl-jkl1657.dial.inet.fi