into mysql.com:/home/hf/work/mysql-5.1.mrg


config/ac-macros/ha_ndbcluster.m4:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged