Merge branch '10.5' into 10.6

MariaDB · Dec 14, 2022 · 4b2e761 · 4b2e761
2 parents a8a5c8a + 687657c
commit 4b2e761
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 0 deletions.
diff --git a/mysql-test/suite/galera/disabled.def b/mysql-test/suite/galera/disabled.def
@@ -20,3 +20,4 @@ galera_var_notify_ssl_ipv6 : MDEV-29861 Galera test case hangs
 galera_var_node_address : MDEV-20485 Galera test failure
 MDEV-26575 : MDEV-29878 Galera test failure on MDEV-26575
 galera_bf_abort_shutdown : MDEV-29918 Assertion failure on galera_bf_abort_shutdown
+galera_wan : [ERROR] WSREP: /home/buildbot/buildbot/build/gcs/src/gcs_state_msg.cpp:gcs_state_msg_get_quorum():947: Failed to establish quorum.
diff --git a/mysql-test/suite/galera_3nodes/disabled.def b/mysql-test/suite/galera_3nodes/disabled.def
@@ -15,3 +15,6 @@ galera_gtid_2_cluster : MDEV-29877 Galera test failure on galera_2_cluster
 galera_parallel_apply_3nodes : MDEV-29368 DEBUG_SYNC timeout
 galera_parallel_apply_3nodes : MDEV-29774 Galera test galera_parallel_apply_3nodes is unstable
 galera_vote_rejoin_mysqldump : MDEV-24481: galera_3nodes.galera_vote_rejoin_mysqldump MTR failed: mysql_shutdown failed
+galera_ssl_reload : MDEV-30172 At line 50: mysql_shutdown failed
+GCF-354 : mysqltest: At line 39: query 'DROP TABLE test.t1' failed: 1047: WSREP has not yet prepared node for application use
+GCF-354 : mysqltest: At line 30: query 'INSERT INTO test.t1 values (1)' failed: 1180: Got error 6 "No such device or address"
diff --git a/mysql-test/suite/galera_sr/disabled.def b/mysql-test/suite/galera_sr/disabled.def
@@ -10,5 +10,6 @@
 #
 ##############################################################################
 
+GCF-1060 : MDEV-26528 wrong usage of mutex LOCK_thd_kill and LOCK_thd_kill
 galera_sr_cc_master : MDEV-29882 Galera test failure on galera_sr_cc_master