into polly.(none):/home/kaa/src/opt/mysql-5.1-opt sql/sql_class.h: Auto merged sql/sql_insert.cc: Auto merged tests/mysql_client_test.c: Auto merged