-
unknown authored
into mysql.com:/home/marty/MySQL/mysql-5.1-new-ndb mysql-test/suite/ndb/r/ndb_insert.result: Auto merged mysql-test/suite/ndb/t/ndb_insert.test: Auto merged sql/ha_ndbcluster.cc: Using local, will merge manually sql/ha_ndbcluster.h: Merge sql/mysqld.cc: Merge
8cadc844