bzr commit into mysql-5.5-telco branch (magnus.blaudd:3095)

[Magnus Blåudd]

#At file:///home/msvensson/mysql/5.5-telco/ based on revid:magnus.blaudd@stripped

 3095 Magnus Blåudd	2010-10-29
      ndb
       - fix problem with extracting the long cluster version string from configure.in
       - apply MCP patch for BUG57843 to 5.5-telco

    modified:
      cmake/mysql_version.cmake
=== modified file 'cmake/mysql_version.cmake'
--- a/cmake/mysql_version.cmake	2010-06-18 15:04:15 +0000
+++ b/cmake/mysql_version.cmake	2010-10-29 12:57:01 +0000
@@ -41,7 +41,11 @@ MACRO(GET_MYSQL_VERSION)
         STRING(REGEX MATCH "[0-9]+\\.[0-9]+\\.[0-9]+" VERSION_STRING "${str}")
         IF(NOT VERSION_STRING)
           FILE(STRINGS  configure.in  str REGEX "AC_INIT\\(")
+          IF(NOT MCP_BUG57843)
+            STRING(REGEX MATCH "[0-9]+\\.[0-9]+\\.[0-9]+[-.a-zAZ0-9]+" VERSION_STRING "${str}")
+          ELSEIF()
           STRING(REGEX MATCH "[0-9]+\\.[0-9]+\\.[0-9]+[-][a-zAZ0-9]+" VERSION_STRING "${str}")
+          ENDIF(MCP_BUG57843)
         ENDIF()
       ENDIF()
     ENDIF()

Attachment: [text/bzr-bundle] bzr/[e-mail]