diff options
| author | unknown <antony@ltantony.mysql.com> | 2005-05-07 08:46:42 +0100 |
|---|---|---|
| committer | unknown <antony@ltantony.mysql.com> | 2005-05-07 08:46:42 +0100 |
| commit | 902aa10d23eed809ce87bf1f3594d50fd5482437 (patch) | |
| tree | 4add1ae5fa620cb95c2dcede7f0f6c911c855950 /BitKeeper | |
| parent | af6ba3866d98a037b5798b0abff2410c4ff91156 (diff) | |
| parent | d459cb8b5a99ea5de482f1fbdd0a47b7625c70ef (diff) | |
| download | mariadb-git-902aa10d23eed809ce87bf1f3594d50fd5482437.tar.gz | |
Merge ltantony.mysql.com:/usr/home/antony/work2/p2-bug6616-4.1
into ltantony.mysql.com:/usr/home/antony/work2/p2-bug6616-5.0
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 16950d3cb32..c75f6010605 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -15,6 +15,7 @@ ahlentz@co3064164-a.rochd1.qld.optusnet.com.au akishkin@work.mysql.com anjuta@arthur.local antony@ltantony.dsl-verizon.net +antony@ltantony.mysql.com antony@ltantony.rdg.cyberkinetica.com antony@ltantony.rdg.cyberkinetica.homeunix.net arjen@bitbike.com |