From 4fbe383a6ac9103769f8d54ee4ffeb95594717ce Mon Sep 17 00:00:00 2001 From: Daniel Bartholomew Date: Wed, 10 Nov 2021 13:10:48 -0500 Subject: [PATCH 1/2] bump the VERSION --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b03b546f..70ff2e8b 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 2) -SET(CPACK_PACKAGE_VERSION_PATCH 5) +SET(CPACK_PACKAGE_VERSION_PATCH 6) 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 + @@ -165,7 +165,7 @@ IF(MAJOR_VERSION) ELSE() SET(MARIADB_CLIENT_VERSION_MAJOR "10") SET(MARIADB_CLIENT_VERSION_MINOR "6") - SET(MARIADB_CLIENT_VERSION_PATCH "5") + SET(MARIADB_CLIENT_VERSION_PATCH "6") SET(MARIADB_CLIENT_VERSION_EXTRA "") ENDIF() From 6ce6dabefaeea9eadfb94ce71c3eddf6da184c87 Mon Sep 17 00:00:00 2001 From: Sutou Kouhei Date: Fri, 19 Nov 2021 15:31:07 +0900 Subject: [PATCH 2/2] Use mariadb_free_rpl_event() for freeing MARIADB_RPL_EVENT --- libmariadb/mariadb_rpl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libmariadb/mariadb_rpl.c b/libmariadb/mariadb_rpl.c index 9bb1916a..914b556a 100644 --- a/libmariadb/mariadb_rpl.c +++ b/libmariadb/mariadb_rpl.c @@ -387,14 +387,14 @@ MARIADB_RPL_EVENT * STDCALL mariadb_rpl_fetch(MARIADB_RPL *rpl, MARIADB_RPL_EVEN } break; default: - free(rpl_event); + mariadb_free_rpl_event(rpl_event); return NULL; break; } return rpl_event; } mem_error: - free(rpl_event); + mariadb_free_rpl_event(rpl_event); SET_CLIENT_ERROR(rpl->mysql, CR_OUT_OF_MEMORY, SQLSTATE_UNKNOWN, 0); return 0; }