diff options
author | unknown <brian@zim.(none)> | 2005-01-31 11:03:57 -0800 |
---|---|---|
committer | unknown <brian@zim.(none)> | 2005-01-31 11:03:57 -0800 |
commit | 665a3efe892736ed1f011a47275ab73f5c7158a3 (patch) | |
tree | 78e8b5f01b4ba8c4de3542fdff7326202312e78b /BitKeeper | |
parent | 6685c7a671f947d631828f3ecadf9a146b28f330 (diff) | |
parent | fa0b4b5e8d45d669d152334f02837db4d73b3844 (diff) | |
download | mariadb-git-665a3efe892736ed1f011a47275ab73f5c7158a3.tar.gz |
Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1
into zim.(none):/home/brian/mysql/mysql-4.1
BitKeeper/etc/logging_ok:
auto-union
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 483f324d89c..6ccc886e161 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -33,6 +33,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 davida@isil.mysql.com dellis@goetia.(none) |