into  debian.(none):/M51/push-5.1


configure.in:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
mysql-test/t/sp_trans_log.test:
  Similar changes in different trees - give main tree precedence.