bzr push into mysql-trunk branch (tor.didriksen:3915 to 3916)

[Tor Didriksen]

 3916 Tor Didriksen	2012-06-28
      The macro GET_MYSQL_VERSION was unable to parse:
      
      MYSQL_VERSION_PATCH=0
      
      Solution: s/IF(NOT PATCH_VERSION)/IF(NOT DEFINED PATCH_VERSION)

    modified:
      cmake/mysql_version.cmake
 3915 Erlend Dahl	2012-06-28
      Update the milestone #

    modified:
      VERSION
=== modified file 'cmake/mysql_version.cmake'
--- a/cmake/mysql_version.cmake	2012-03-23 10:32:33 +0000
+++ b/cmake/mysql_version.cmake	2012-06-28 06:58:40 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -49,19 +49,26 @@ MACRO(GET_MYSQL_VERSION)
   MYSQL_GET_CONFIG_VALUE("MYSQL_VERSION_PATCH" PATCH_VERSION)
   MYSQL_GET_CONFIG_VALUE("MYSQL_VERSION_EXTRA" EXTRA_VERSION)
 
-  IF(NOT MAJOR_VERSION OR NOT MINOR_VERSION OR NOT PATCH_VERSION)
+  IF(NOT DEFINED MAJOR_VERSION OR
+     NOT DEFINED MINOR_VERSION OR
+     NOT DEFINED PATCH_VERSION)
     MESSAGE(FATAL_ERROR "VERSION file cannot be parsed.")
   ENDIF()
 
-  SET(VERSION "${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}${EXTRA_VERSION}")
+  SET(VERSION
+    "${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}${EXTRA_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}")
+  SET(MYSQL_BASE_VERSION
+    "${MAJOR_VERSION}.${MINOR_VERSION}" CACHE INTERNAL "MySQL Base version")
+  SET(MYSQL_NO_DASH_VERSION
+    "${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_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}")
+  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})
   SET(CPACK_PACKAGE_VERSION_MINOR ${MINOR_VERSION})

No bundle (reason: useless for push emails).