diff options
| author | unknown <tulin@dl145c.mysql.com> | 2005-05-18 22:26:23 +0200 |
|---|---|---|
| committer | unknown <tulin@dl145c.mysql.com> | 2005-05-18 22:26:23 +0200 |
| commit | 024e1d1bce4a95555b6eff511094258a1f263352 (patch) | |
| tree | d7d25b0632c9a5473f4af7b1b2c772b0e543f694 /BitKeeper | |
| parent | 2fe8cc51aad5fb7958a90ea8be3667f1e23b0ea5 (diff) | |
| parent | 6f7bccd1aca31045e2678159e2e931d2e94f54dd (diff) | |
| download | mariadb-git-024e1d1bce4a95555b6eff511094258a1f263352.tar.gz | |
merge
BitKeeper/etc/logging_ok:
auto-union
BUILD/compile-alpha-cxx:
Auto merged
BUILD/compile-alpha-debug:
Auto merged
configure.in:
Auto merged
sql/handler.cc:
Auto merged
sql/handler.h:
Auto merged
sql/item.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'BitKeeper')
| -rw-r--r-- | BitKeeper/etc/logging_ok | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index b2712cb3f56..0fc575526e5 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -246,6 +246,8 @@ salle@geopard.online.bg salle@vafla.home salle@vafla.online.bg sasha@mysql.sashanet.com +schwenke@lmy003.wdf.sap.corp +schwenke@lmy003.xl.local serg@build.mysql.com serg@build.mysql2.com serg@mysql.com |