diff options
| author | unknown <monty@tik.mysql.fi> | 2001-06-11 15:07:42 +0300 |
|---|---|---|
| committer | unknown <monty@tik.mysql.fi> | 2001-06-11 15:07:42 +0300 |
| commit | 036396bc666abaa317dfd3cc700fc5fe77db9cc4 (patch) | |
| tree | 8c159bf0b7ac39297b7107fce1cdea569b61661f /BitKeeper | |
| parent | e47948041ac3dc470e0f01792d33cd3b1572fce6 (diff) | |
| parent | 765940cb3abccdbfe9e43f2c1116d1e96eb27ae9 (diff) | |
| download | mariadb-git-036396bc666abaa317dfd3cc700fc5fe77db9cc4.tar.gz | |
Merge work:/my/mysql into tik.mysql.fi:/home/my/mysql
BitKeeper/etc/logging_ok:
auto-union
Docs/manual.texi:
Auto merged
sql-bench/README:
Auto merged
Diffstat (limited to 'BitKeeper')
| -rw-r--r-- | BitKeeper/etc/logging_ok | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index 8f4e935d486..39de42e998d 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -1,4 +1,5 @@ heikki@donna.mysql.fi jani@janikt.pp.saunalahti.fi -paul@teton.kitebird.com +monty@tik.mysql.fi mwagner@evoq.mwagner.org +paul@teton.kitebird.com |