diff options
| author | unknown <jcole@tetra.spaceapes.com> | 2001-02-16 15:47:37 -0600 |
|---|---|---|
| committer | unknown <jcole@tetra.spaceapes.com> | 2001-02-16 15:47:37 -0600 |
| commit | 3d30ff09fd589e6229a3109a96f4f0fc477b3ace (patch) | |
| tree | 0d2a5deaa57fadd5bb8774a1131036293ef371e9 /BitKeeper | |
| parent | 790efcea7f6eda03f66fd0fe4298b65b991261dd (diff) | |
| parent | 2f894668708804050ca580663f8ef4fcd7df7151 (diff) | |
| download | mariadb-git-3d30ff09fd589e6229a3109a96f4f0fc477b3ace.tar.gz | |
Merge work.mysql.com:/home/bk/mysql
into tetra.spaceapes.com:/usr/home/jcole/bk/mysql
BitKeeper/etc/logging_ok:
auto-union
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'BitKeeper')
| -rw-r--r-- | BitKeeper/etc/logging_ok | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index 3a8edc4b064..c2b6edfd4a9 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -1,14 +1,14 @@ jcole@tetra.spaceapes.com monty@donna.mysql.com monty@work.mysql.com +mwagner@evoq.mwagner.org mwagner@work.mysql.com paul@central.snake.net sasha@mysql.sashanet.com sasha@work.mysql.com serg@donna.mysql.com serg@serg.mysql.com +tfr@coyote.emotion.ee tim@cane.mysql.fi tim@threads.polyesthetic.msg tim@work.mysql.com -mwagner@evoq.mwagner.org -tfr@coyote.emotion.ee |