From a78d404377ae3c498b5bc4d0e17318fbcb86922c Mon Sep 17 00:00:00 2001 From: Daniel Bartholomew Date: Wed, 11 Aug 2021 16:44:05 -0400 Subject: [PATCH 1/5] bump the VERSION --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4fa25281..decb5b9b 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 14) +SET(CPACK_PACKAGE_VERSION_PATCH 15) 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 cc56a1ced5aae8b0b0e17311443764a8bf840422 Mon Sep 17 00:00:00 2001 From: Vladislav Vaintroub Date: Fri, 13 Aug 2021 08:15:40 +0200 Subject: [PATCH 2/5] Fix MSVC/ASAN error Apparently, it complains about wild pointer freed in when using ASAN_OPTIONS= windows_hook_rtl_allocators=true while it seems like a false positive, take it as a good opportunity to remove allocators from Win3.1 times, and replace with simple malloc/free --- libmariadb/secure/ma_schannel.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libmariadb/secure/ma_schannel.c b/libmariadb/secure/ma_schannel.c index e989aeaa..30b69d37 100644 --- a/libmariadb/secure/ma_schannel.c +++ b/libmariadb/secure/ma_schannel.c @@ -96,7 +96,7 @@ SECURITY_STATUS ma_schannel_handshake_loop(MARIADB_PVIO *pvio, my_bool InitialRe /* Allocate data buffer */ - if (!(IoBuffer = LocalAlloc(LMEM_FIXED, SC_IO_BUFFER_SIZE))) + if (!(IoBuffer = malloc(SC_IO_BUFFER_SIZE))) return SEC_E_INSUFFICIENT_MEMORY; cbIoBuffer = 0; @@ -245,7 +245,7 @@ loopend: ma_schannel_set_sec_error(pvio, rc); DeleteSecurityContext(&sctx->hCtxt); } - LocalFree(IoBuffer); + free(IoBuffer); return rc; } From 9990ab7d4941fccb02917b74ae65e32c167aaf9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= Date: Wed, 25 Aug 2021 09:10:10 +0300 Subject: [PATCH 3/5] Fix clang -Wunused-but-set-variable --- unittest/libmariadb/cursor.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/unittest/libmariadb/cursor.c b/unittest/libmariadb/cursor.c index 6378501a..2da9e5e1 100644 --- a/unittest/libmariadb/cursor.c +++ b/unittest/libmariadb/cursor.c @@ -210,12 +210,6 @@ int fetch_n(MYSQL *mysql, const char **query_list, unsigned query_count, } } } - if (!error_count) - { - unsigned total_row_count= 0; - for (fetch= fetch_array; fetch < fetch_array + query_count; ++fetch) - total_row_count+= fetch->row_count; - } for (fetch= fetch_array; fetch < fetch_array + query_count; ++fetch) stmt_fetch_close(fetch); free(fetch_array); From 42cb1e442c43902e2866bea38d15f2ed1f5d38b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= Date: Wed, 25 Aug 2021 09:37:42 +0300 Subject: [PATCH 4/5] test_bug38486(): Do not leave behind a garbage table This fixes "Check of testcase failed for: unit.conc_cursor" in the MariaDB Server test suite. --- unittest/libmariadb/cursor.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/unittest/libmariadb/cursor.c b/unittest/libmariadb/cursor.c index 2da9e5e1..332202dc 100644 --- a/unittest/libmariadb/cursor.c +++ b/unittest/libmariadb/cursor.c @@ -1502,6 +1502,8 @@ static int test_bug38486(MYSQL *mysql) check_stmt_rc(rc, stmt); rc= mysql_stmt_execute(stmt); check_stmt_rc(rc, stmt); + rc= mysql_query(mysql, "DROP TABLE IF EXISTS t10"); + check_mysql_rc(rc, mysql); mysql_stmt_close(stmt); return OK; From d72b85c39659ec493112c817c019961b92d8f48b Mon Sep 17 00:00:00 2001 From: diego Dupin Date: Mon, 30 Aug 2021 15:54:29 +0200 Subject: [PATCH 5/5] [misc] ensuring PR test suite runs correctly --- .travis.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 48d14ccc..05ede2af 100644 --- a/.travis.yml +++ b/.travis.yml @@ -50,17 +50,17 @@ jobs: - env: srv=mariadb v=10.4 local=1 - env: srv=mariadb v=10.5 local=1 - env: srv=mariadb v=10.6 local=1 - - if: env(CONNECTOR_TEST_SECRET_KEY) + - if: env(TRAVIS_PULL_REQUEST) = "false" env: srv=mariadb-es v=10.5 - - if: env(CONNECTOR_TEST_SECRET_KEY) + - if: env(TRAVIS_PULL_REQUEST) = "false" env: srv=maxscale - - if: env(CONNECTOR_TEST_SECRET_KEY) + - if: env(TRAVIS_PULL_REQUEST) = "false" env: srv=build v=10.6 - env: srv=mysql v=5.7 native=1 - env: srv=mysql v=8.0 native=1 - - if: env(CONNECTOR_TEST_SECRET_KEY) + - if: env(TRAVIS_PULL_REQUEST) = "false" env: srv=skysql - - if: env(CONNECTOR_TEST_SECRET_KEY) + - if: env(TRAVIS_PULL_REQUEST) = "false" env: srv=skysql-ha - env: server_branch=10.2 - env: server_branch=10.2 TEST_OPTION=--ps-protocol