into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-maint


sql/ha_ndbcluster.h:
  Auto merged
sql/set_var.cc:
  Auto merged
storage/ndb/tools/restore/restore_main.cpp:
  Auto merged
mysql-test/include/have_ndb.inc:
  manual merge
mysql-test/t/disabled.def:
  manual merge