into five.local.lan:/work/merge/mysql-5.1-build CMakeLists.txt: Auto merged support-files/mysql.server.sh: Auto merged