bzr push into mysql-5.5-cluster-7.2 branch (magnus.blaudd:3859 to 3860)

[magnus.blaudd]

 3860 magnus.blaudd@stripped	2012-03-23
      Cherrypick build fixes for MySQL CLuster from 5.5

    modified:
      INSTALL-SOURCE
      INSTALL-WIN-SOURCE
      cmake/mysql_version.cmake
      cmake/package_name.cmake
 3859 magnus.blaudd@stripped	2012-03-23 [merge]
      Merge

    modified:
      sql/ndb_mi.cc
=== modified file 'INSTALL-SOURCE'
--- a/INSTALL-SOURCE	2007-11-23 09:15:55 +0000
+++ b/INSTALL-SOURCE	2012-03-23 11:32:43 +0000
@@ -1,7 +1,7 @@
 
 You can find information about how to install from a source distributions at
 
-  http://dev.mysql.com/doc/refman/5.1/en/installing-source.html
+  http://dev.mysql.com/doc/refman/5.5/en/source-installation.html
 
 The MySQL Reference Manual is also available in various formats on
 http://dev.mysql.com/doc; if you're interested in the DocBook XML

=== modified file 'INSTALL-WIN-SOURCE'
--- a/INSTALL-WIN-SOURCE	2007-11-23 09:15:55 +0000
+++ b/INSTALL-WIN-SOURCE	2012-03-23 11:32:43 +0000
@@ -2,7 +2,7 @@
 You can find information about how to install from a Windows source
 distributions at
 
-  http://dev.mysql.com/doc/refman/5.1/en/windows-source-build.html
+  http://dev.mysql.com/doc/refman/5.5/en/source-installation.html
 
 The MySQL Reference Manual is also available in various formats on
 http://dev.mysql.com/doc; if you're interested in the DocBook XML

=== modified file 'cmake/mysql_version.cmake'
--- a/cmake/mysql_version.cmake	2011-11-21 09:30:56 +0000
+++ b/cmake/mysql_version.cmake	2012-03-23 11:32:43 +0000
@@ -57,7 +57,10 @@ MACRO(GET_MYSQL_VERSION)
   MESSAGE("-- MySQL ${VERSION}")
   SET(MYSQL_BASE_VERSION "${MAJOR_VERSION}.${MINOR_VERSION}" CACHE INTERNAL "MySQL Base version")
   SET(MYSQL_NO_DASH_VERSION "${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}")
-  STRING(REPLACE "-" "_" MYSQL_RPM_VERSION "${VERSION}")
+  # Use NDBVERSION irregardless of whether this is Cluster or not, if not
+  # then the regex will be ignored anyway.
+  STRING(REGEX REPLACE "^.*-ndb-" "" NDBVERSION "${VERSION}")
+  STRING(REPLACE "-" "_" MYSQL_RPM_VERSION "${NDBVERSION}")
   MATH(EXPR MYSQL_VERSION_ID "10000*${MAJOR_VERSION} + 100*${MINOR_VERSION} + ${PATCH_VERSION}")
   MARK_AS_ADVANCED(VERSION MYSQL_VERSION_ID MYSQL_BASE_VERSION)
   SET(CPACK_PACKAGE_VERSION_MAJOR ${MAJOR_VERSION})
@@ -93,6 +96,10 @@ ENDIF()
 
 IF(NOT CPACK_SOURCE_PACKAGE_FILE_NAME)
   SET(CPACK_SOURCE_PACKAGE_FILE_NAME "mysql-${VERSION}")
+  IF("${VERSION}" MATCHES "-ndb-")
+    STRING(REGEX REPLACE "^.*-ndb-" "" NDBVERSION "${VERSION}")
+    SET(CPACK_SOURCE_PACKAGE_FILE_NAME "mysql-cluster-gpl-${NDBVERSION}")
+  ENDIF()
 ENDIF()
 SET(CPACK_PACKAGE_CONTACT "MySQL Release Engineering <mysql-build@stripped>")
 SET(CPACK_PACKAGE_VENDOR "Oracle Corporation")

=== modified file 'cmake/package_name.cmake'
--- a/cmake/package_name.cmake	2011-06-30 15:46:53 +0000
+++ b/cmake/package_name.cmake	2012-03-23 11:32:43 +0000
@@ -116,8 +116,15 @@ IF(NOT VERSION)
     SET(PRODUCT_TAG)
   ENDIF()
 
-  SET(package_name "mysql${PRODUCT_TAG}-${VERSION}-${SYSTEM_NAME_AND_PROCESSOR}")
-  
+  IF("${VERSION}" MATCHES "-ndb-")
+    STRING(REGEX REPLACE "^.*-ndb-" "" NDBVERSION "${VERSION}")
+    SET(package_name "mysql-cluster${PRODUCT_TAG}-${NDBVERSION}-${SYSTEM_NAME_AND_PROCESSOR}")
+  ELSE()
+    SET(package_name "mysql${PRODUCT_TAG}-${VERSION}-${SYSTEM_NAME_AND_PROCESSOR}")
+  ENDIF()
+
+  MESSAGE("-- Packaging as: ${package_name}")
+
   # Sometimes package suffix is added (something like "-icc-glibc23")
   IF(PACKAGE_SUFFIX)
     SET(package_name "${package_name}${PACKAGE_SUFFIX}")

No bundle (reason: useless for push emails).