into trift2.:/MySQL/M51/push-5.1 mysql-test/mysql-test-run.pl: Auto merged sql/sql_class.cc: Auto merged