diff options
| author | unknown <dean@mysql.com> | 2005-02-15 17:30:40 -0600 |
|---|---|---|
| committer | unknown <dean@mysql.com> | 2005-02-15 17:30:40 -0600 |
| commit | 1218a7c20cf30f05fa1997db6e2ec7098b6a0f78 (patch) | |
| tree | 9d8f74510e2a458f7f568a7f4c389fba234b9871 /BitKeeper | |
| parent | 69a6d4da0b778d231396a40ac9d696b9f0dacc27 (diff) | |
| parent | 3be01953d123eb200a5c8bb85b7bbb0c50ffda47 (diff) | |
| download | mariadb-git-1218a7c20cf30f05fa1997db6e2ec7098b6a0f78.tar.gz | |
Merge mysql.com:/home/dellis/mysqlab/bk/mysql-4.0
into mysql.com:/home/dellis/bkl/bug-4.1
BitKeeper/etc/logging_ok:
auto-union
myisam/ft_nlq_search.c:
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 b88eb69544d..940af9510b2 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -36,6 +36,7 @@ brian@private-client-ip-101.oz.net brian@zim.(none) carsten@tsort.bitbybit.dk davida@isil.mysql.com +dean@mysql.com dellis@goetia.(none) dlenev@brandersnatch.localdomain dlenev@build.mysql.com |