From 1ae7809a7c87d914d92ad7e069000358c1fe5bfd Mon Sep 17 00:00:00 2001 From: Daniele Sciascia Date: Fri, 13 Nov 2020 11:38:17 +0100 Subject: [PATCH 1/4] Restore autoincrement offset in MTR test MDEV-24063 --- mysql-test/suite/galera/r/MDEV-24063.result | 2 ++ mysql-test/suite/galera/t/MDEV-24063.test | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/mysql-test/suite/galera/r/MDEV-24063.result b/mysql-test/suite/galera/r/MDEV-24063.result index 757cc07a642..d7eda917cdf 100644 --- a/mysql-test/suite/galera/r/MDEV-24063.result +++ b/mysql-test/suite/galera/r/MDEV-24063.result @@ -1,5 +1,7 @@ connection node_2; connection node_1; +connection node_1; +connection node_2; connect node_2a, 127.0.0.1, root, , test, $NODE_MYPORT_2; connection node_2a; CREATE TABLE t1 (f1 INTEGER PRIMARY KEY); diff --git a/mysql-test/suite/galera/t/MDEV-24063.test b/mysql-test/suite/galera/t/MDEV-24063.test index 24c5071cb15..9646db5d6d5 100644 --- a/mysql-test/suite/galera/t/MDEV-24063.test +++ b/mysql-test/suite/galera/t/MDEV-24063.test @@ -8,6 +8,10 @@ --source include/galera_cluster.inc +--let $node_1=node_1 +--let $node_2=node_2 +--source include/auto_increment_offset_save.inc + --connect node_2a, 127.0.0.1, root, , test, $NODE_MYPORT_2 --connection node_2a CREATE TABLE t1 (f1 INTEGER PRIMARY KEY); @@ -18,3 +22,5 @@ SET GLOBAL wsrep_on=OFF; --source include/start_mysqld.inc DROP TABLE t1; + +--source include/auto_increment_offset_restore.inc From eae9311fa2b15eb8a0698444a27af5b70acfb4b2 Mon Sep 17 00:00:00 2001 From: Monty Date: Mon, 16 Nov 2020 13:23:39 +0200 Subject: [PATCH 2/4] Do not run maria.repair with --embedded as memory usage is different --- mysql-test/suite/maria/repair.test | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/mysql-test/suite/maria/repair.test b/mysql-test/suite/maria/repair.test index 9603a949f9b..13165269b76 100644 --- a/mysql-test/suite/maria/repair.test +++ b/mysql-test/suite/maria/repair.test @@ -1,3 +1,9 @@ +# We should not run this test with embedded as we are using +# max_session_mem_used, which causes things to fail/not fail randomly +# as memory usage is different compared to normal server. + +--source include/not_embedded.inc + # # MDEV-11539 test_if_reopen: Assertion `strcmp(share->unique_file_name,filename) || share->last_version' failed upon select from I_S # From 796f708f85d3b8b68d1aa338dfa60cfea8f3cdac Mon Sep 17 00:00:00 2001 From: Dmitry Shulga Date: Tue, 17 Nov 2020 19:23:33 +0700 Subject: [PATCH 3/4] MDEV-24115 Fix -Wconversion in Timeval::Timeval() on Mac OS X The data member tv_usec of the struct timeval is declared as suseconds_t on MacOS. Size of suseconds_t is 4 bytes. On the other hand, size of ulong is 8 bytes on 64-bit MacOS, so attempt to assign a value of wider type (usec) to a value (tv_usec) of narrower type leads to error. --- sql/structs.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/sql/structs.h b/sql/structs.h index c47e4802452..28c0cb6e1a2 100644 --- a/sql/structs.h +++ b/sql/structs.h @@ -871,7 +871,13 @@ public: Timeval(my_time_t sec, ulong usec) { tv_sec= sec; - tv_usec= usec; + /* + Since tv_usec is not always of type ulong, cast usec parameter + explicitly to uint to avoid compiler warnings about losing + integer precision. + */ + DBUG_ASSERT(usec < 1000000); + tv_usec= (uint)usec; } explicit Timeval(const timeval &tv) :timeval(tv) From bbf0b55c177a4c4eafe1bd1948df651eaee56827 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= Date: Tue, 17 Nov 2020 18:13:47 +0200 Subject: [PATCH 4/4] Work around MDEV-24232: Skip perfschema.nesting if WITH_WSREP=OFF --- mysql-test/suite/perfschema/t/nesting.test | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mysql-test/suite/perfschema/t/nesting.test b/mysql-test/suite/perfschema/t/nesting.test index d0547d8a932..6144d0ff6d3 100644 --- a/mysql-test/suite/perfschema/t/nesting.test +++ b/mysql-test/suite/perfschema/t/nesting.test @@ -6,6 +6,8 @@ # event, which changes the test output. --source include/not_windows.inc --source include/no_protocol.inc +# Work around MDEV-24232: WSREP causes extra operations on LOCK_thd_data etc. +--source include/have_wsrep.inc --source ../include/wait_for_pfs_thread_count.inc --disable_query_log