diff options
| author | unknown <dean@mysql.com> | 2005-02-16 17:35:00 -0600 |
|---|---|---|
| committer | unknown <dean@mysql.com> | 2005-02-16 17:35:00 -0600 |
| commit | 6bb46afb5d6f2171e8eec7691c0349b2eeff70d0 (patch) | |
| tree | 0619d5ed4fae59f365eaa45b8576979f77bf3797 /BitKeeper | |
| parent | 8cf5a1cccb91d2c6a7993f0af6c75442b7fef7bf (diff) | |
| parent | d8b0113653f3e6468ae46e5952d8bd5d82bcff74 (diff) | |
| download | mariadb-git-6bb46afb5d6f2171e8eec7691c0349b2eeff70d0.tar.gz | |
Merge mysql.com:/home/dellis/bkl/bug-4.1
into mysql.com:/home/dellis/bkl/bug-5.0
BitKeeper/etc/logging_ok:
auto-union
mysql-test/r/fulltext.result:
Auto merged
Diffstat (limited to 'BitKeeper')
| -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 76027180194..5acd00e6604 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -38,6 +38,7 @@ brian@zim.(none) carsten@tsort.bitbybit.dk cps@silver_beast.(none) davida@isil.mysql.com +dean@mysql.com dellis@goetia.(none) dlenev@brandersnatch.localdomain dlenev@build.mysql.com |