diff options
| author | unknown <acurtis@xiphis.org> | 2005-04-09 00:36:08 +0100 |
|---|---|---|
| committer | unknown <acurtis@xiphis.org> | 2005-04-09 00:36:08 +0100 |
| commit | 2054223668a8a53cdd35eb60c23c92d74ad9dd7f (patch) | |
| tree | b1ecb9cb422d7fed611b7901d4c764981ad8754e /BitKeeper/etc | |
| parent | 01b0f1a3e5fdb514e9cfde3db07cb6a323e367a4 (diff) | |
| parent | fbb21ebfe26e2cbb1729ac419e3fb659b6c3b4b5 (diff) | |
| download | mariadb-git-2054223668a8a53cdd35eb60c23c92d74ad9dd7f.tar.gz | |
Merge xiphis.org:/var/db/bk/work-acurtis/bug6776.1
into xiphis.org:/var/db/bk/work-acurtis/bug6776.2
BitKeeper/etc/logging_ok:
auto-union
sql/sql_udf.cc:
Auto merged
Diffstat (limited to 'BitKeeper/etc')
| -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 9fecb756be0..e706a3358d5 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -9,6 +9,7 @@ Sinisa@sinisa.nasamreza.org WAX@sergbook.mysql.com acurtis@ltantony.rdg.cyberkinetica.homeunix.net acurtis@pcgem.rdg.cyberkinetica.com +acurtis@xiphis.org administrador@light.hegel.local ahlentz@co3064164-a.rochd1.qld.optusnet.com.au akishkin@work.mysql.com |