into chilla.local:/home/mydev/mysql-5.1-axmrg configure.in: Auto merged sql/sql_insert.cc: Auto merged