into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint


mysql-test/suite/rpl/r/rpl_misc_functions.result:
  Auto merged
mysql-test/suite/rpl/t/rpl_misc_functions.test:
  Merge 5.0->5.1
mysql-test/t/sp.test:
  Merge 5.0->5.1