into mockturtle.local:/home/dlenev/src/mysql-5.1-merge mysql-test/t/sp-error.test: Auto merged sql/sql_table.cc: Auto merged