Skip to content

Commit 51675dd

Browse files
author
Tor Didriksen
committed
Bug #31466846 RENAME THE VERSION FILE TO MYSQL_VERSION
With new versions of boost, the build is broken on windows. <version> is a header file which is part of C++11, but on win we include our own VERSION instead, and the build breaks. The solution is 'git mv VERSION MYSQL_VERSION', and adapt cmake code accordingly. Change-Id: I5211cf41fa83e879a25d4110dbb8933cd58da2f9
1 parent 6653b43 commit 51675dd

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

VERSION renamed to MYSQL_VERSION

File renamed without changes.

cmake/mysql_version.cmake

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2009, 2019, Oracle and/or its affiliates. All rights reserved.
1+
# Copyright (c) 2009, 2020, Oracle and/or its affiliates.
22
#
33
# This program is free software; you can redistribute it and/or modify
44
# it under the terms of the GNU General Public License, version 2.0,
@@ -28,17 +28,17 @@ SET(SHARED_LIB_MAJOR_VERSION "21")
2828
SET(SHARED_LIB_MINOR_VERSION "1")
2929
SET(PROTOCOL_VERSION "10")
3030

31-
# Generate "something" to trigger cmake rerun when VERSION changes
31+
# Generate "something" to trigger cmake rerun when MYSQL_VERSION changes
3232
CONFIGURE_FILE(
33-
${CMAKE_SOURCE_DIR}/VERSION
33+
${CMAKE_SOURCE_DIR}/MYSQL_VERSION
3434
${CMAKE_BINARY_DIR}/VERSION.dep
3535
)
3636

37-
# Read value for a variable from VERSION.
37+
# Read value for a variable from MYSQL_VERSION.
3838

3939
MACRO(MYSQL_GET_CONFIG_VALUE keyword var)
4040
IF(NOT ${var})
41-
FILE (STRINGS ${CMAKE_SOURCE_DIR}/VERSION str REGEX "^[ ]*${keyword}=")
41+
FILE (STRINGS ${CMAKE_SOURCE_DIR}/MYSQL_VERSION str REGEX "^[ ]*${keyword}=")
4242
IF(str)
4343
STRING(REPLACE "${keyword}=" "" str ${str})
4444
STRING(REGEX REPLACE "[ ].*" "" str "${str}")
@@ -59,7 +59,7 @@ MACRO(GET_MYSQL_VERSION)
5959
IF(NOT DEFINED MAJOR_VERSION OR
6060
NOT DEFINED MINOR_VERSION OR
6161
NOT DEFINED PATCH_VERSION)
62-
MESSAGE(FATAL_ERROR "VERSION file cannot be parsed.")
62+
MESSAGE(FATAL_ERROR "MYSQL_VERSION file cannot be parsed.")
6363
ENDIF()
6464

6565
SET(VERSION
@@ -80,7 +80,7 @@ MACRO(GET_MYSQL_VERSION)
8080
SET(CPACK_PACKAGE_VERSION_PATCH ${PATCH_VERSION})
8181

8282
IF(WITH_NDBCLUSTER)
83-
# Read MySQL Cluster version values from VERSION, these are optional
83+
# Read MySQL Cluster version values from MYSQL_VERSION, these are optional
8484
# as by default MySQL Cluster is using the MySQL Server version
8585
MYSQL_GET_CONFIG_VALUE("MYSQL_CLUSTER_VERSION_MAJOR" CLUSTER_MAJOR_VERSION)
8686
MYSQL_GET_CONFIG_VALUE("MYSQL_CLUSTER_VERSION_MINOR" CLUSTER_MINOR_VERSION)
@@ -89,12 +89,12 @@ MACRO(GET_MYSQL_VERSION)
8989

9090
# Set MySQL Cluster version same as the MySQL Server version
9191
# unless a specific MySQL Cluster version has been specified
92-
# in the VERSION file. This is the version used when creating
92+
# in the MYSQL_VERSION file. This is the version used when creating
9393
# the cluster package names as well as by all the NDB binaries.
9494
IF(DEFINED CLUSTER_MAJOR_VERSION AND
9595
DEFINED CLUSTER_MINOR_VERSION AND
9696
DEFINED CLUSTER_PATCH_VERSION)
97-
# Set MySQL Cluster version to the specific version defined in VERSION
97+
# Set MySQL Cluster version to the specific version defined in MYSQL_VERSION
9898
SET(MYSQL_CLUSTER_VERSION "${CLUSTER_MAJOR_VERSION}")
9999
SET(MYSQL_CLUSTER_VERSION
100100
"${MYSQL_CLUSTER_VERSION}.${CLUSTER_MINOR_VERSION}")
@@ -106,7 +106,7 @@ MACRO(GET_MYSQL_VERSION)
106106
ENDIF()
107107
ELSE()
108108
# Set MySQL Cluster version to the same as MySQL Server, possibly
109-
# overriding the extra version with value specified in VERSION
109+
# overriding the extra version with value specified in MYSQL_VERSION
110110
# This might be used when MySQL Cluster is still released as DMR
111111
# while MySQL Server is already GA.
112112
SET(MYSQL_CLUSTER_VERSION

0 commit comments

Comments
 (0)