into  weblab.(none):/home/marcsql/TREE/mysql-5.0-runtime


mysql-test/include/sp-vars.inc:
  Auto merged
mysql-test/r/sp-vars.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/r/trigger.result:
  Auto merged
mysql-test/t/sp-vars.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysql-test/t/trigger.test:
  Auto merged
sql/sp_head.cc:
  Auto merged