Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
unknown authored
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb

84876432