-
unknown authored
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb mysql-test/suite/ndb/r/ndb_update.result: Auto merged mysql-test/suite/ndb/t/ndb_update.test: Auto merged sql/ha_ndbcluster.cc: Merge sql/ha_ndbcluster.h: Merge
7ad287af
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb mysql-test/suite/ndb/r/ndb_update.result: Auto merged mysql-test/suite/ndb/t/ndb_update.test: Auto merged sql/ha_ndbcluster.cc: Merge sql/ha_ndbcluster.h: Merge