diff options
| author | unknown <gbichot@quadxeon.mysql.com> | 2005-03-17 17:00:44 +0100 |
|---|---|---|
| committer | unknown <gbichot@quadxeon.mysql.com> | 2005-03-17 17:00:44 +0100 |
| commit | ba9a0fea50dc9b25621cdc461210a243d83f8a24 (patch) | |
| tree | 659b6396fba4955d48e719462482761b7201b438 /BitKeeper/etc | |
| parent | 3e4ae65a144d8f7a63ee5f8c4d1ec65f94f35b58 (diff) | |
| parent | 05534c4df038c95b03ec4341186d44e81610c4dd (diff) | |
| download | mariadb-git-ba9a0fea50dc9b25621cdc461210a243d83f8a24.tar.gz | |
Merge quadxeon.mysql.com:/nfstmp1/guilhem/mysql-4.0-4xeon
into quadxeon.mysql.com:/nfstmp1/guilhem/mysql-4.1-4xeon
BitKeeper/etc/logging_ok:
auto-union
sql/log_event.cc:
Auto merged
Diffstat (limited to 'BitKeeper/etc')
| -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 8a0c32e37d1..1a7799dc442 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -44,6 +44,7 @@ dlenev@build.mysql.com dlenev@jabberwock.localdomain dlenev@mysql.com ejonore@mc03.ndb.mysql.com +gbichot@quadxeon.mysql.com georg@beethoven.local georg@lmy002.wdf.sap.corp gerberb@ou800.zenez.com |