diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2014-08-21 18:11:46 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2014-10-11 18:53:06 +0200 |
| commit | 7f5e51b940d65cf541403a50af74163b9aed5cb8 (patch) | |
| tree | e540d3cd4d678cd276a9d496490ac5e527f30a78 /cmake/mysql_version.cmake | |
| parent | 57dd1f6f3fcbc7a46e1b3e71257987315f7aa687 (diff) | |
| download | mariadb-git-7f5e51b940d65cf541403a50af74163b9aed5cb8.tar.gz | |
MDEV-34 delete storage/ndb and sql/*ndb* (and collateral changes)
remove:
* NDB from everywhere
* IM from mtr-v1
* packaging/rpm-oel and packaging/rpm-uln
* few unused spec files
* plug.in file
* .bzrignore
Diffstat (limited to 'cmake/mysql_version.cmake')
| -rw-r--r-- | cmake/mysql_version.cmake | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/cmake/mysql_version.cmake b/cmake/mysql_version.cmake index f147f6ef2bf..1802b1a2678 100644 --- a/cmake/mysql_version.cmake +++ b/cmake/mysql_version.cmake @@ -59,10 +59,6 @@ IF(NOT "${MAJOR_VERSION}" MATCHES "[0-9]+" OR MESSAGE(STATUS "MariaDB ${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}") MARK_AS_ADVANCED(VERSION MYSQL_VERSION_ID MYSQL_BASE_VERSION) SET(CPACK_PACKAGE_VERSION_MAJOR ${MAJOR_VERSION}) @@ -93,10 +89,6 @@ ENDIF() IF(NOT CPACK_SOURCE_PACKAGE_FILE_NAME) SET(CPACK_SOURCE_PACKAGE_FILE_NAME "mariadb-${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 "MariaDB team <info@montyprogram.com>") SET(CPACK_PACKAGE_VENDOR "Monty Program AB") |