database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2026-10-23 21:49:05 +03:00
Code Activity

Merge pull request #1421 from benthompson15/fixVersionString

Browse Source 
Version string displayed as 1.5.3.2 for this release.
This commit is contained in:
Patrick LeBlanc
2020-09-03 15:32:20 -05:00
committed by GitHub
parent da7f2b8461 d17d136f95
commit e1bdec9de1
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/columnstore_version.cmake
View File

@@ -33,14 +33,14 @@ IF(NOT "${CS_MAJOR_VERSION}" MATCHES "[0-9]+" OR
MESSAGE(FATAL_ERROR "VERSION file cannot be parsed.")
ENDIF()
SET(VERSION "${CS_MAJOR_VERSION}.${CS_MINOR_VERSION}.${CS_PATCH_VERSION}${CS_EXTRA_VERSION}")
SET(VERSION "${CS_MAJOR_VERSION}.${CS_MINOR_VERSION}.${CS_PATCH_VERSION}${CS_EXTRA_VERSION}.${CS_RELEASE_VERSION}")
MESSAGE("== MariaDB-Columnstore ${VERSION}")
IF (NOT INSTALL_LAYOUT)
SET(CPACK_PACKAGE_VERSION_MAJOR ${CS_MAJOR_VERSION})
SET(CPACK_PACKAGE_VERSION_MINOR ${CS_MINOR_VERSION})
SET(CPACK_PACKAGE_VERSION_PATCH ${CS_PATCH_VERSION}${CS_EXTRA_VERSION})
ENDIF ()
SET(PACKAGE_VERSION "${CS_MAJOR_VERSION}.${CS_MINOR_VERSION}.${CS_PATCH_VERSION}${CS_EXTRA_VERSION}")
SET(PACKAGE_VERSION "${CS_MAJOR_VERSION}.${CS_MINOR_VERSION}.${CS_PATCH_VERSION}${CS_EXTRA_VERSION}.${CS_RELEASE_VERSION}")
SET(PACKAGE_RELEASE "${CS_RELEASE_VERSION}")
if (${CS_MINOR_VERSION} LESS 10)
SET(MCSVERSIONHEX "0x0${CS_MAJOR_VERSION}0${CS_MINOR_VERSION}")

2
dbcon/mysql/ha_mcs.cpp
View File

@@ -139,7 +139,7 @@ static int columnstore_init_func(void* p)
tm.tm_year % 100, tm.tm_mon + 1, tm.tm_mday,
tm.tm_hour, tm.tm_min, tm.tm_sec);
fprintf(stderr, "Columnstore: Started; Version: %s-%s\n", columnstore_version.c_str(), columnstore_release.c_str());
fprintf(stderr, "Columnstore: Started; Version: %s\n", columnstore_version.c_str());
strncpy(cs_version, columnstore_version.c_str(), sizeof(cs_version));
cs_version[sizeof(cs_version) - 1] = 0;