diff options
| author | unknown <hf@bisonxp.(none)> | 2002-09-02 17:22:41 +0500 |
|---|---|---|
| committer | unknown <hf@bisonxp.(none)> | 2002-09-02 17:22:41 +0500 |
| commit | ca5f6235d369a398ffa22d25574767a7f1bff774 (patch) | |
| tree | fffbc1277cde4f88f256b4dc49b04b79e5b126b1 /BitKeeper | |
| parent | de566e0a5348ce743a31f51d19b88382dc388a95 (diff) | |
| parent | 3a9dabd6765e7dad0cbd6949ac275487f72696d2 (diff) | |
| download | mariadb-git-ca5f6235d369a398ffa22d25574767a7f1bff774.tar.gz | |
Merge abotchkov@work.mysql.com:/home/bk/mysql-4.1
into bisonxp.(none):/home/hf/work/mysql-4.1
BitKeeper/etc/logging_ok:
auto-union
sql/item.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_handler.cc:
Auto merged
sql/sql_select.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 315c0c6d673..590ec192a2e 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -9,6 +9,7 @@ akishkin@work.mysql.com arjen@co3064164-a.bitbike.com arjen@fred.bitbike.com arjen@george.bitbike.com +bar@bar.mysql.r18.ru bar@bar.udmsearch.izhnet.ru bar@gw.udmsearch.izhnet.ru bell@sanja.is.com.ua |