From fcb61b539165a6a3bcee9a17fc206b0e3bcb68ec Mon Sep 17 00:00:00 2001 From: Georg Richter Date: Wed, 24 May 2023 20:39:36 +0200 Subject: [PATCH 1/2] Bump version number. New version 3.1.22 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5ee354b36..c84dbbd5d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,7 +37,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 21) +SET(CPACK_PACKAGE_VERSION_PATCH 22) 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 d543bed61ba9a117e95764dd1429b21c3e0579d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= Date: Mon, 26 Jun 2023 10:59:14 +0300 Subject: [PATCH 2/2] Fix GCC 13 -Wmaybe-uninitialized --- libmariadb/mariadb_lib.c | 5 ++--- libmariadb/mariadb_stmt.c | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/libmariadb/mariadb_lib.c b/libmariadb/mariadb_lib.c index d31f33abd..8abcad907 100644 --- a/libmariadb/mariadb_lib.c +++ b/libmariadb/mariadb_lib.c @@ -2044,7 +2044,7 @@ void my_set_error(MYSQL *mysql, { va_list ap; - const char *errmsg; + const char *errmsg= format; mysql->net.last_errno= error_nr; ma_strmake(mysql->net.sqlstate, sqlstate, SQLSTATE_LENGTH); @@ -2061,8 +2061,7 @@ void my_set_error(MYSQL *mysql, } va_start(ap, format); - vsnprintf(mysql->net.last_error, MYSQL_ERRMSG_SIZE - 1, - format ? format : errmsg, ap); + vsnprintf(mysql->net.last_error, MYSQL_ERRMSG_SIZE - 1, errmsg, ap); va_end(ap); return; } diff --git a/libmariadb/mariadb_stmt.c b/libmariadb/mariadb_stmt.c index 7e9221642..3f610669a 100644 --- a/libmariadb/mariadb_stmt.c +++ b/libmariadb/mariadb_stmt.c @@ -90,7 +90,7 @@ void stmt_set_error(MYSQL_STMT *stmt, { va_list ap; - const char *errmsg; + const char *errmsg= format; stmt->last_errno= error_nr; ma_strmake(stmt->sqlstate, sqlstate, SQLSTATE_LENGTH); @@ -116,8 +116,7 @@ void stmt_set_error(MYSQL_STMT *stmt, } va_start(ap, format); - vsnprintf(stmt->last_error, MYSQL_ERRMSG_SIZE - 1, - format ? format : errmsg, ap); + vsnprintf(stmt->last_error, MYSQL_ERRMSG_SIZE - 1, errmsg, ap); va_end(ap); return; }