into chilla.local:/home/mydev/mysql-5.1-axmrg mysql-test/r/show_check.result: Auto merged mysql-test/t/show_check.test: Auto merged sql/sql_insert.cc: Auto merged