into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-work


sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.h:
  Auto merged