Merge 10.7 into 10.8

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.

mysql-test/suite/galera_3nodes/disabled.def

@@ -17,3 +17,6 @@ galera_ipv6_mariabackup : MDEV-24097
 galera_ipv6_mariabackup_section :  MDEV-24097, MDEV-22195
 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"

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
 

storage/spider/mysql-test/spider/bugfix/r/mdev_29855.result

@@ -20,6 +20,8 @@ CREATE TABLE tbl_a (
 a INT
 ) ENGINE=Spider DEFAULT CHARSET=utf8 COMMENT='table "tbl_a", srv "s_2_1"';
 SET spider_udf_ds_use_real_table=1;
+Warnings:
+Warning	1287	'@@spider_udf_ds_use_real_table' is deprecated and will be removed in a future release
 SELECT SPIDER_DIRECT_SQL('select 1 as 1', 'tbl_a', 'srv "s_2_1"');
 ERROR 3D000: No database selected
 connection master_1;