into polly.(none):/home/kaa/src/opt/bug9481/my51-bug9481 sql/sql_class.h: Null merge. sql/sql_insert.cc: Null merge. tests/mysql_client_test.c: Null merge.
