into mysql.com:/home/psergey/mysql-5.0-rpl-bug sql/sp_head.cc: Auto merged sql/sql_class.cc: Auto merged