diff options
| author | unknown <antony@ltantony.mysql.com> | 2005-05-06 16:16:05 +0100 |
|---|---|---|
| committer | unknown <antony@ltantony.mysql.com> | 2005-05-06 16:16:05 +0100 |
| commit | 2f05048b2a5f02a4e47e6f80721d92a552c7c735 (patch) | |
| tree | 216e0b065b223c54e4cc30608ff1094d4ff6c297 /BitKeeper | |
| parent | 71c6170632b23930d3aaae920f9bed30131703b6 (diff) | |
| parent | d7eae4a167d44edf4af730142df0e8520943d762 (diff) | |
| download | mariadb-git-2f05048b2a5f02a4e47e6f80721d92a552c7c735.tar.gz | |
Merge ltantony.mysql.com:/usr/home/antony/work2/p2-bug6616
into ltantony.mysql.com:/usr/home/antony/work2/p2-bug6616-4.1
BitKeeper/etc/logging_ok:
auto-union
sql/sql_base.cc:
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 5049352c8d4..1323f7a72f1 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -13,6 +13,7 @@ administrador@light.hegel.local ahlentz@co3064164-a.rochd1.qld.optusnet.com.au akishkin@work.mysql.com antony@ltantony.dsl-verizon.net +antony@ltantony.mysql.com antony@ltantony.rdg.cyberkinetica.com antony@ltantony.rdg.cyberkinetica.homeunix.net arjen@bitbike.com |