into polly.(none):/home/kaa/src/opt/mysql-5.1-opt mysql-test/r/select.result: Auto merged mysql-test/t/select.test: Auto merged sql/sql_select.cc: Auto merged