diff options
| author | unknown <mysqldev@mysql.com> | 2004-05-19 14:39:24 +0200 |
|---|---|---|
| committer | unknown <mysqldev@mysql.com> | 2004-05-19 14:39:24 +0200 |
| commit | d1946959ee0cc4dbfe8feb43c5c9591f1de81044 (patch) | |
| tree | d036c950634d1ef5fe276e8dfbb38f742fda7cd1 /BitKeeper | |
| parent | 2369c9b238f463aec50cede2fcfdc55fffb7b448 (diff) | |
| parent | e492e90255d4190c65fea2d87a063e5cd6599f49 (diff) | |
| download | mariadb-git-d1946959ee0cc4dbfe8feb43c5c9591f1de81044.tar.gz | |
Merge mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/home/mysqldev/tulin/mysql-4.1-ndb
BitKeeper/etc/logging_ok:
auto-union
ndb/src/kernel/blocks/dbdict/Dbdict.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 af1c31cc327..1c51ce68476 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -113,6 +113,7 @@ mwagner@work.mysql.com mydev@mysql.com mysql@home.(none) mysqldev@build.mysql2.com +mysqldev@mysql.com ndbdev@ndbmaster.mysql.com nick@mysql.com nick@nick.leippe.com |