mysql-test/r/sp.result:
  After merge fix.
mysql-test/t/sp.test:
  After merge fixes. Restored test for bug 21002 which has mysteriously
  disappeared from 5.1 tree.