into polly.(none):/home/kaa/src/maint/mysql-5.1-maint mysql-test/t/insert.test: Auto merged mysql-test/t/variables.test: Auto merged sql/field.cc: Auto merged