into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build sql/sql_base.cc: Auto merged sql/sql_cache.cc: Auto merged configure.in: null-merge