diff options
| author | unknown <lars@mysql.com> | 2005-04-19 11:09:54 +0200 |
|---|---|---|
| committer | unknown <lars@mysql.com> | 2005-04-19 11:09:54 +0200 |
| commit | 5f3052698663d741cea915e74ae180e5241d6c81 (patch) | |
| tree | 82617d0fcbec77f54df35f27b2a89108ac86b497 /BitKeeper/etc/logging_ok | |
| parent | c0333ecee42a4de499b3377cfa21d7b5af1ddd2b (diff) | |
| parent | 9e7028c8e0708877fa802a1b589f695d78ccd1ea (diff) | |
| download | mariadb-git-5f3052698663d741cea915e74ae180e5241d6c81.tar.gz | |
Merging 5.0->5.1
BitKeeper/etc/logging_ok:
auto-union
BitKeeper/triggers/post-commit:
Auto merged
mysql-test/r/grant.result:
Auto merged
scripts/mysql_create_system_tables.sh:
Auto merged
scripts/mysql_fix_privilege_tables.sql:
Auto merged
sql/Makefile.am:
Auto merged
sql/log.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'BitKeeper/etc/logging_ok')
| -rw-r--r-- | BitKeeper/etc/logging_ok | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index 1897af73735..dc419e29ef4 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 @@ -56,8 +57,10 @@ georg@beethoven.local georg@beethoven.site georg@lmy002.wdf.sap.corp gerberb@ou800.zenez.com +gluh@eagle.intranet.mysql.r18.ru gluh@gluh.(none) gluh@gluh.mysql.r18.ru +gluh@mysql.com gordon@zero.local.lan greg@gcw.ath.cx greg@mysql.com |