mirror of
https://github.com/MariaDB/server.git
synced 2026-04-20 15:25:33 +02:00
mysql-5.5.29 merge
This commit is contained in:
commit
d3935adf7a
94 changed files with 4301 additions and 321 deletions
|
|
@ -54,7 +54,7 @@ MACRO(GET_MYSQL_VERSION)
|
|||
ENDIF()
|
||||
|
||||
SET(VERSION "${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}${EXTRA_VERSION}")
|
||||
MESSAGE("-- MariaDB ${VERSION}")
|
||||
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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue