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

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


configure.in:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged