into mysql.com:/home/pem/work/mysql-5.0


sql/sp_head.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged