From 907ed6878648d5470f2a95820628e81f6ef78e13 Mon Sep 17 00:00:00 2001 From: Daniel Bartholomew Date: Mon, 14 Feb 2022 14:32:03 -0500 Subject: [PATCH 1/4] bump the VERSION --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d245b6e2..1a853c7a 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 6) +SET(CPACK_PACKAGE_VERSION_PATCH 8) 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 "6") - SET(MARIADB_CLIENT_VERSION_PATCH "6") + SET(MARIADB_CLIENT_VERSION_PATCH "8") SET(MARIADB_CLIENT_VERSION_EXTRA "") ENDIF() From 82de6eeb44ad33aaff116cd80e4ff0a6fab13772 Mon Sep 17 00:00:00 2001 From: Daniel Bartholomew Date: Mon, 14 Feb 2022 14:35:26 -0500 Subject: [PATCH 2/4] bump the VERSION --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 76036d1d..45bd220e 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 16) +SET(CPACK_PACKAGE_VERSION_PATCH 17) 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 abc1cf89f145d6044e7811690399793c25ba6107 Mon Sep 17 00:00:00 2001 From: Georg Richter Date: Tue, 1 Mar 2022 10:23:34 +0100 Subject: [PATCH 3/4] Test fix: For detecting if we test against MaxScale check also if mysql_get_server_info contains "maxScale". --- unittest/libmariadb/my_test.h | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/unittest/libmariadb/my_test.h b/unittest/libmariadb/my_test.h index ca9fed77..58765a9b 100644 --- a/unittest/libmariadb/my_test.h +++ b/unittest/libmariadb/my_test.h @@ -73,7 +73,12 @@ if (IS_SKYSQL(hostname)) \ #define SKIP_NOTLS #endif -#define IS_MAXSCALE() (getenv("srv")!=NULL && (strcmp(getenv("srv"), "maxscale") == 0 || strcmp(getenv("srv"), "skysql-ha") == 0)) +MYSQL *mysql_default = NULL; /* default connection */ + +#define IS_MAXSCALE()\ + ((mysql_default && strstr(mysql_get_server_info(mysql_default), "maxScale")) ||\ + (getenv("srv")!=NULL && (strcmp(getenv("srv"), "maxscale") == 0 ||\ + strcmp(getenv("srv"), "skysql-ha") == 0))) #define SKIP_MAXSCALE \ if (IS_MAXSCALE()) \ { \ @@ -644,7 +649,7 @@ MYSQL *my_test_connect(MYSQL *mysql, void run_tests(struct my_tests_st *test) { int i, rc, total=0; - MYSQL *mysql, *mysql_default= NULL; /* default connection */ + MYSQL *mysql; while (test[total].function) total++; From 367772c5c96117e073d7aea3390f589565fccb54 Mon Sep 17 00:00:00 2001 From: Georg Richter Date: Tue, 1 Mar 2022 10:53:57 +0100 Subject: [PATCH 4/4] Skip test_mdev19838 when running vs. maxscale --- 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 65fbcd9c..10507c2d 100644 --- a/unittest/libmariadb/ps_bugs.c +++ b/unittest/libmariadb/ps_bugs.c @@ -5358,6 +5358,8 @@ static int test_mdev19838(MYSQL *mysql) char charvalue[] = "012345678901234567890123456789012345"; MYSQL_STMT *stmt; + SKIP_MAXSCALE; + rc = mysql_query(mysql, "CREATE temporary TABLE mdev19838(" "f1 char(36)," "f2 char(36),"