into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint extra/comp_err.c: Auto merged sql/mysqld.cc: Auto merged