into  zim.(none):/home/brian/mysql/arch-5.1


sql/ha_ndbcluster.cc:
  Auto merged
sql/log.cc:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  Auto merged