Merge five.local.lan:/work/trees/mysql-5.1-build-src-clean

into  five.local.lan:/work/merge/mysql-5.1-build


CMakeLists.txt:
  Auto merged
support-files/mysql.server.sh:
  Auto merged

CMakeLists.txt

@@ -13,6 +13,8 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
+CMAKE_MINIMUM_REQUIRED(VERSION 2.4.7 FATAL_ERROR)
+
 PROJECT(MySql)
 
 # This reads user configuration, generated by configure.js.

support-files/mysql.server.sh

@@ -314,7 +314,7 @@ case "$mode" in
       fi
       exit $return_value
     else
-      log_failure_msg "Couldn't find MySQL manager or server"
+      log_failure_msg "Couldn't find MySQL manager ($manager) or server ($bindir/mysqld_safe)"
     fi
     ;;