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


mysql-test/t/sp-code.test:
  Auto merged