into  vajra.(none):/opt/local/work/mysql-5.1-runtime


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