Merge branch '3.1' of https://github.com/mariadb-corporation/mariadb-…

…connector-c into 3.1
mariadb-corporation · May 31, 2022 · 04be26e · 04be26e
2 parents 02a2be0 + 18ae382
commit 04be26e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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   +
@@ -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}")

diff --git a/libmariadb/ma_client_plugin.c.in b/libmariadb/ma_client_plugin.c.in