diff options
| author | unknown <tomas@poseidon.ndb.mysql.com> | 2004-09-24 11:07:55 +0000 |
|---|---|---|
| committer | unknown <tomas@poseidon.ndb.mysql.com> | 2004-09-24 11:07:55 +0000 |
| commit | 6876d28c423c8e411eac4a2207500c9a057ac862 (patch) | |
| tree | 70a87fbb9a868fda326310d056682465d575b8bb /BitKeeper | |
| parent | a366d6eefc1a52dc3c4097faff18787c91363d5e (diff) | |
| parent | c9a03e1781d5ffb6640f270caa53386819726be5 (diff) | |
| download | mariadb-git-6876d28c423c8e411eac4a2207500c9a057ac862.tar.gz | |
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb-merge
BitKeeper/etc/logging_ok:
auto-union
configure.in:
Auto merged
Diffstat (limited to 'BitKeeper')
| -rw-r--r-- | BitKeeper/etc/logging_ok | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index 6520b17e787..77c82618446 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -24,6 +24,7 @@ bar@bar.udmsearch.izhnet.ru bar@deer.(none) bar@gw.udmsearch.izhnet.ru bar@mysql.com +bar@noter.intranet.mysql.r18.ru bell@laptop.sanja.is.com.ua bell@sanja.is.com.ua bk@admin.bk |