Merge mariadb-10.10.5 into 10.10

Author: dr-m

mysql-test/suite/galera/r/galera_query_cache_invalidate.result

@@ -8,6 +8,8 @@ connection node_4;
 call mtr.add_suppression("WSREP: Ignoring server id for non bootstrap node.");
 connection node_3;
 CHANGE MASTER TO master_host='127.0.0.1', master_user='root', master_port=NODE_MYPORT_1, master_use_gtid=current_pos;;
+Warnings:
+Warning	1681	'master_use_gtid=current_pos' is deprecated and will be removed in a future release. Please use master_demote_to_slave=1 instead
 START SLAVE;
 include/wait_for_slave_to_start.inc
 connection node_1;
@@ -110,6 +112,8 @@ connection node_3;
 connection node_3;
 STOP SLAVE;
 RESET SLAVE ALL;
+Warnings:
+Note	4190	RESET SLAVE is implicitly changing the value of 'Using_Gtid' from 'Current_Pos' to 'Slave_Pos'
 connection node_1;
 SET SESSION WSREP_ON=OFF;
 RESET MASTER;