diff options
| author | unknown <joreland@mysql.com> | 2005-01-05 21:22:38 +0100 |
|---|---|---|
| committer | unknown <joreland@mysql.com> | 2005-01-05 21:22:38 +0100 |
| commit | 49206d2d161d758ab7cb9fcd810cdb898fd80e30 (patch) | |
| tree | 90f7e4464d248fc0b3590b399ef76194080b6364 /BitKeeper | |
| parent | b6e39434664c2f00ee1f3f70e62d9ab3835a4524 (diff) | |
| parent | 97682b76d299f87c7be1d4e9a26eb6f1f935ff41 (diff) | |
| download | mariadb-git-49206d2d161d758ab7cb9fcd810cdb898fd80e30.tar.gz | |
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/home/jonas/src/mysql-5.0-ndb
BitKeeper/etc/logging_ok:
auto-union
sql/ha_ndbcluster.cc:
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 922020178ff..48cf4069ffc 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -96,6 +96,7 @@ jcole@tetra.spaceapes.com jimw@mysql.com joerg@mysql.com jon@gigan. +jonas@mysql.com joreland@bk-internal.mysql.com joreland@mysql.com jorge@linux.jorge.mysql.com |