into  neptunus.(none):/home/msvensson/mysql/bug10656/my51-bug10656


mysql-test/r/sp.result:
  Auto merged
mysql-test/r/sp_trans.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged