From 072dadc39272204e4654c37e3e2c45a6d57a14a8 Mon Sep 17 00:00:00 2001 From: Georg Richter Date: Mon, 13 May 2024 15:54:04 +0200 Subject: [PATCH 1/3] Disable test when running against MySQL server --- unittest/libmariadb/ps_bugs.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/unittest/libmariadb/ps_bugs.c b/unittest/libmariadb/ps_bugs.c index f73ce643..91de2ee3 100644 --- a/unittest/libmariadb/ps_bugs.c +++ b/unittest/libmariadb/ps_bugs.c @@ -5502,6 +5502,8 @@ static int test_conc633(MYSQL *mysql) int ret= FAIL; int rc; + SKIP_MYSQL(mysql); + if (!mariadb_stmt_execute_direct(stmt, SL("SÄLECT 1"))) { diag("Syntax error expected"); From 96bedf002a749c6cf5237be626794f812d69074b Mon Sep 17 00:00:00 2001 From: Georg Richter Date: Mon, 13 May 2024 15:57:00 +0200 Subject: [PATCH 2/3] bump version --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e8b498bb..06ff1832 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 23) +SET(CPACK_PACKAGE_VERSION_PATCH 24) 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 d5394838fd586103ac13b39b95701114729a1dbd Mon Sep 17 00:00:00 2001 From: Georg Richter Date: Mon, 13 May 2024 15:57:39 +0200 Subject: [PATCH 3/3] CONC-696: Replace COM_PROCESS_KILL by KILL command Since COM_PROCESS_KILL isn't supported by newer MySQL versions. --- libmariadb/mariadb_lib.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/libmariadb/mariadb_lib.c b/libmariadb/mariadb_lib.c index 32e66bea..39e69243 100644 --- a/libmariadb/mariadb_lib.c +++ b/libmariadb/mariadb_lib.c @@ -2785,10 +2785,13 @@ mysql_refresh(MYSQL *mysql,uint options) int STDCALL mysql_kill(MYSQL *mysql,ulong pid) { - char buff[12]; - int4store(buff,pid); - /* if we kill our own thread, reading the response packet will fail */ - return(ma_simple_command(mysql, COM_PROCESS_KILL,buff,4,0,0)); + char buff[26]; + + if (pid & (~0xFFFFFFFFUL)) + snprintf(buff, sizeof buff, "KILL %llu", (ulonglong)pid); + else + snprintf(buff, sizeof buff, "KILL %lu", pid); + return mysql_real_query(mysql, (char *)buff, (ulong)strlen(buff)); }