diff options
| author | unknown <joreland@mysql.com> | 2004-12-31 10:07:49 +0100 |
|---|---|---|
| committer | unknown <joreland@mysql.com> | 2004-12-31 10:07:49 +0100 |
| commit | 2709f21556189ca78e39b67222c8e99d5b3f9fe0 (patch) | |
| tree | 2ba8db4ddc0546d36766a8ea11a3a7102c1f0361 /BitKeeper | |
| parent | 5098405248ef944f5ef61052a9ea3baa5885a571 (diff) | |
| parent | f43d5367d5619f961e57c644723202587c7e015b (diff) | |
| download | mariadb-git-2709f21556189ca78e39b67222c8e99d5b3f9fe0.tar.gz | |
Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
BitKeeper/etc/logging_ok:
auto-union
ndb/test/ndbapi/testBitfield.cpp:
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 bbf039b8139..dbdeb43a2e4 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -239,6 +239,7 @@ ulli@morbus.(none) venu@hundin.mysql.fi venu@myvenu.com venu@work.mysql.com +vtkachenko@intelp4d.mysql.com vva@eagle.mysql.r18.ru vva@genie.(none) vva@mysql.r18.ru |