diff options
| author | unknown <jimw@mysql.com> | 2005-05-07 08:35:55 -0700 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-05-07 08:35:55 -0700 |
| commit | 04b938c9a42e1c3b62481c1e1134d35474f85e15 (patch) | |
| tree | 5c4ffab7beb9222a278a204a8cfec12168277199 /BitKeeper | |
| parent | 0de8a53ff223bee81fa8bd17adecf2be8767fa26 (diff) | |
| parent | e584559febc18f045b74e1e13e58c88eba92c76a (diff) | |
| download | mariadb-git-04b938c9a42e1c3b62481c1e1134d35474f85e15.tar.gz | |
Merge
BitKeeper/etc/logging_ok:
auto-union
configure.in:
Auto merged
sql/share/Makefile.am:
Auto merged
libmysql/libmysql.c:
Merge from 4.0
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 1323f7a72f1..ac7413062d6 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -48,6 +48,7 @@ dlenev@mysql.com ejonore@mc03.ndb.mysql.com evgen@moonbone.(none) evgen@moonbone.local +gbichot@production.mysql.com gbichot@quadita2.mysql.com gbichot@quadxeon.mysql.com georg@beethoven.local |