diff options
| author | unknown <joreland@mysql.com> | 2004-08-27 14:11:50 +0200 |
|---|---|---|
| committer | unknown <joreland@mysql.com> | 2004-08-27 14:11:50 +0200 |
| commit | 5637b16ba2f90d9bb375cf53ef8a7db84e4eb9f9 (patch) | |
| tree | 2da1f0e51d6ba2ad537dadb34b4e50433c665211 /BitKeeper | |
| parent | 622651983fbd68d1095b187ad4aca08a7c3a7a64 (diff) | |
| parent | 5d568135c81450edb43d9208ea50ec9648dbc62a (diff) | |
| download | mariadb-git-5637b16ba2f90d9bb375cf53ef8a7db84e4eb9f9.tar.gz | |
Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1-ndb
BitKeeper/etc/logging_ok:
auto-union
ndb/include/ndb_global.h:
Auto merged
ndb/src/common/mgmcommon/NdbConfig.c:
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 52013cfbd16..c3ca14ab929 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -80,6 +80,7 @@ jcole@mugatu.jcole.us jcole@mugatu.spaceapes.com jcole@sarvik.tfr.cafe.ee jcole@tetra.spaceapes.com +joerg@mysql.com joreland@mysql.com jorge@linux.jorge.mysql.com jplindst@t41.(none) |