database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-09 22:24:09 +03:00
Code Activity

The bzr revision visible in @@version_comment should

Browse Source 
represent the last merged revision from codership branch
and not the revision of the MGC tree itself.

Fixed by adding a cmake variable to hold the revision
number of last merged revision from codership branch.
This commit is contained in:
Nirbhay Choubey
2014-01-23 15:57:47 -05:00
parent 9d5c3731be
commit d2c72da610
1 changed files with 8 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
cmake/wsrep.cmake
View File

@@ -20,24 +20,15 @@
# Set the patch version
SET(WSREP_PATCH_VERSION "9")
# Obtain patch revision number:
# The script tries to probe the bzr revision number using $ENV{WSREP_REV}, and
# "bzr revno" if the WSREP_REV is not defined. In case both fail, the revision
# information is not appended to the wsrep patch version.
# MariaDB addition: Revision number of the last revision merged from
# codership branch visible in @@visible_comment.
# Branch : codership-mysql/5.5
SET(WSREP_PATCH_REVNO "3932") # Should be updated on every merge.
# 1: $ENV{WSREP_REV}
SET(WSREP_PATCH_REVNO $ENV{WSREP_REV})
# 2: bzr revno
IF(NOT WSREP_PATCH_REVNO)
EXECUTE_PROCESS(
COMMAND bzr revno
OUTPUT_VARIABLE WSREP_PATCH_REVNO
RESULT_VARIABLE RESULT
)
STRING(REGEX REPLACE "(\r?\n)+$" "" WSREP_PATCH_REVNO "${WSREP_PATCH_REVNO}")
#FILE(WRITE "wsrep_config" "Debug: WSREP_PATCH_REVNO result: ${RESULT}\n")
# MariaDB: Obtain patch revision number:
# Update WSREP_PATCH_REVNO if WSREP_REV environment variable is set.
IF (DEFINED ENV{WSREP_REV})
SET(WSREP_PATCH_REVNO $ENV{WSREP_REV})
ENDIF()
# Obtain wsrep API version