diff options
| author | unknown <serg@serg.mysql.com> | 2001-06-03 09:06:12 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mysql.com> | 2001-06-03 09:06:12 +0200 |
| commit | 0105fae75feb1bc4fce2af3b329348c7bc1607b3 (patch) | |
| tree | 04cf15d29cf7815f05c8c28c822622d072b1c51c /BitKeeper | |
| parent | 46c2c71016c626fbbff519dff870f86626439f84 (diff) | |
| parent | b6cb800dbec8081be8c4d19c639e6d2f8d570ad7 (diff) | |
| download | mariadb-git-0105fae75feb1bc4fce2af3b329348c7bc1607b3.tar.gz | |
Merge work:/home/bk/mysql into serg.mysql.com:/usr/home/serg/Abk/mysql
BitKeeper/etc/logging_ok:
auto-union
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'BitKeeper')
| -rw-r--r-- | BitKeeper/etc/logging_ok | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index 0518f8664e3..e694ec83285 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -1,6 +1,7 @@ +heikki@donna.mysql.fi jani@janikt.pp.saunalahti.fi monty@hundin.mysql.fi mwagner@evoq.mwagner.org -heikki@donna.mysql.fi -sasha@mysql.sashanet.com paul@central.snake.net +sasha@mysql.sashanet.com +serg@serg.mysql.com |