into stella.local:/home2/mydev/mysql-5.1-axmrg mysql-test/t/query_cache.test: Auto merged sql/mysql_priv.h: Auto merged sql/sql_delete.cc: Auto merged mysql-test/r/query_cache.result: SCCS merged