From 4a997779344ecba44858b27fdcdaa18736a6fb5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= Date: Mon, 23 May 2022 16:20:21 +0300 Subject: [PATCH 1/3] Fix permissions after 79137a4ae1cf37ab46940d26879051ad1dfce512 Thanks to Michal Schorm for noticing this. --- libmariadb/ma_client_plugin.c.in | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 libmariadb/ma_client_plugin.c.in diff --git a/libmariadb/ma_client_plugin.c.in b/libmariadb/ma_client_plugin.c.in old mode 100755 new mode 100644 From 96bbb2bb1b16a91f9f96569c3cff710198ce7e87 Mon Sep 17 00:00:00 2001 From: Daniel Bartholomew Date: Wed, 25 May 2022 12:02:26 -0400 Subject: [PATCH 2/3] bump the VERSION --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 45bd220eb..0a62e2e57 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -36,7 +36,7 @@ SET(CC_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}) SET(CPACK_PACKAGE_VERSION_MAJOR 3) SET(CPACK_PACKAGE_VERSION_MINOR 1) -SET(CPACK_PACKAGE_VERSION_PATCH 17) +SET(CPACK_PACKAGE_VERSION_PATCH 18) SET(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}") MATH(EXPR MARIADB_PACKAGE_VERSION_ID "${CPACK_PACKAGE_VERSION_MAJOR} * 10000 + ${CPACK_PACKAGE_VERSION_MINOR} * 100 + From 18ae3823899a92c64bf49a92b15db7e0859832ef Mon Sep 17 00:00:00 2001 From: Daniel Bartholomew Date: Wed, 25 May 2022 12:06:46 -0400 Subject: [PATCH 3/3] update MARIADB_CLIENT_VERSION_PATCH to next MariaDB 10.5 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0a62e2e57..c491df694 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -170,7 +170,7 @@ IF(MAJOR_VERSION) ELSE() SET(MARIADB_CLIENT_VERSION_MAJOR "10") SET(MARIADB_CLIENT_VERSION_MINOR "5") - SET(MARIADB_CLIENT_VERSION_PATCH "14") + SET(MARIADB_CLIENT_VERSION_PATCH "17") SET(MARIADB_CLIENT_VERSION_EXTRA "") ENDIF() SET(MARIADB_CLIENT_VERSION "${MARIADB_CLIENT_VERSION_MAJOR}.${MARIADB_CLIENT_VERSION_MINOR}.${MARIADB_CLIENT_VERSION_PATCH}${MARIADB_CLIENT_VERSION_EXTRA}")