into  mysql.com:/home/marty/MySQL/mysql-5.1-ndb


mysql-test/r/ndb_read_multi_range.result:
  Auto merged
mysql-test/t/ndb_lock.test:
  Auto merged
mysql-test/t/ndb_read_multi_range.test:
  Auto merged
storage/ndb/include/ndbapi/NdbTransaction.hpp:
  Auto merged
mysql-test/r/ndb_lock.result:
  Merge (using local)
sql/ha_ndbcluster.cc:
  Merge fix for bug #18184  SELECT ... FOR UPDATE does not work..
sql/ha_ndbcluster.h:
  Merge fix for bug #18184  SELECT ... FOR UPDATE does not work..