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


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