diff options
| author | unknown <mikef@nslinux.bedford.progress.com> | 2001-05-29 09:38:16 -0400 |
|---|---|---|
| committer | unknown <mikef@nslinux.bedford.progress.com> | 2001-05-29 09:38:16 -0400 |
| commit | dedf125dc190adfdb75a6b1f6548edc58dd70ba2 (patch) | |
| tree | 1b1fda7e938bc039b981239a041c88d00c40002c /BitKeeper | |
| parent | 97d52615353c9afd110c5656ddde131f3477a029 (diff) | |
| parent | 9d52381348a5ff15e856d3efc2004bbe36bb39bd (diff) | |
| download | mariadb-git-dedf125dc190adfdb75a6b1f6548edc58dd70ba2.tar.gz | |
Merge nusphere@work.mysql.com:/home/bk/mysql
into nslinux.bedford.progress.com:/usr1/mikef/MYSQL/there
BitKeeper/etc/logging_ok:
auto-union
configure.in:
Auto merged
Docs/manual.texi:
Auto merged
sql/share/english/errmsg.txt:
Auto merged
Diffstat (limited to 'BitKeeper')
| -rw-r--r-- | BitKeeper/etc/logging_ok | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index f517c9a46cc..7902f10c3d3 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -1,6 +1,7 @@ -mwagner@evoq.mwagner.org -sasha@mysql.sashanet.com heikki@donna.mysql.fi miguel@linux.local -monty@tik.mysql.fi +mikef@nslinux.bedford.progress.com monty@donna.mysql.fi +monty@tik.mysql.fi +mwagner@evoq.mwagner.org +sasha@mysql.sashanet.com |