into  kpdesk.mysql.com:/home/thek/dev/mysql-5.0-maint


sql/sql_parse.cc:
  Auto merged
mysql-test/r/rpl_sp.result:
  - merged
mysql-test/t/rpl_sp.test:
  -merged