diff options
| author | unknown <lars@mysql.com> | 2005-05-09 11:45:59 +0200 |
|---|---|---|
| committer | unknown <lars@mysql.com> | 2005-05-09 11:45:59 +0200 |
| commit | 14b614e16414acc996a932c73f3d0a8e4e83538a (patch) | |
| tree | 075608ca4d88921bffb8479717d99dadb29f3770 /BitKeeper/etc/logging_ok | |
| parent | 383c19a0442f914b18e5f146f5adfa78359ec5f2 (diff) | |
| parent | 848611b5ed1e565d02eea896e22753b818c458c5 (diff) | |
| download | mariadb-git-14b614e16414acc996a932c73f3d0a8e4e83538a.tar.gz | |
Merge mysql.com:/home/bk/mysql-5.0 into mysql.com:/home/bk/mysql-5.1
BitKeeper/etc/logging_ok:
auto-union
configure.in:
Auto merged
BUILD/FINISH.sh:
Auto merged
BUILD/compile-dist:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/item.cc:
Auto merged
sql/log.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
storage/ndb/src/cw/cpcd/Process.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
Auto merged
storage/ndb/src/kernel/error/ErrorReporter.cpp:
Auto merged
storage/ndb/src/ndbapi/Ndb.cpp:
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 a3b7c5ed7e8..3e07576ce12 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -115,6 +115,7 @@ jcole@sarvik.tfr.cafe.ee jcole@tetra.spaceapes.com jimw@mysql.com joerg@mysql.com +joerg@trift-lap.fambruehe jon@gigan. jonas@mysql.com joreland@bk-internal.mysql.com @@ -180,6 +181,7 @@ mwagner@cash.mwagner.org mwagner@evoq.mwagner.org mwagner@here.mwagner.org mwagner@mysql.com +mwagner@ultrafly.mysql.com mwagner@work.mysql.com mydev@mysql.com mysql@home.(none) @@ -227,6 +229,7 @@ ram@ram-book.(none) ram@ram.(none) ramil@mysql.com ranger@regul.home.lan +rburnett@bk-internal.mysql.com rburnett@build.mysql.com reggie@bob.(none) reggie@mdk10.(none) |