diff options
| author | unknown <joreland@mysql.com> | 2005-01-07 06:47:41 +0100 |
|---|---|---|
| committer | unknown <joreland@mysql.com> | 2005-01-07 06:47:41 +0100 |
| commit | b95768589a270b5a78b4271cd7a822ac78eca3f6 (patch) | |
| tree | 051513962f1b57393d29fefb562b3522fdf6251b /BitKeeper | |
| parent | 4d960869efa5c9f6821269229b66cfec4130b1ad (diff) | |
| parent | d732379b30c019cb63b498a26fc8f38c51cea16b (diff) | |
| download | mariadb-git-b95768589a270b5a78b4271cd7a822ac78eca3f6.tar.gz | |
merge
BitKeeper/etc/logging_ok:
auto-union
ndb/src/mgmsrv/main.cpp:
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 48cf4069ffc..0f4bc8d7b37 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -34,6 +34,7 @@ bk@mysql.r18.ru brian@avenger.(none) brian@brian-akers-computer.local brian@private-client-ip-101.oz.net +brian@zim.(none) carsten@tsort.bitbybit.dk cps@silver_beast.(none) davida@isil.mysql.com |