into  debian.(none):/M50/push-5.0


sql/ha_ndbcluster.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged