into trift2.:/MySQL/M51/push-5.1 mysql-test/t/disabled.def: Auto merged sql/sql_base.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_table.cc: Auto merged