into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user


mysql-test/t/ndb_basic.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
mysql-test/r/ndb_basic.result:
  manual merge