into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build configure.in: Auto merged libmysql/libmysql.c: Auto merged sql/field.cc: Auto merged