Conflicts:
	mysql-test/suite/ndb/r/ndb_import0.result
	mysql-test/suite/ndb/r/ndb_restore_print.result

Extra test update:
        mysql-test/suite/ndb/r/ndb_basic_ndbd.result