Update galera tests to adapt to recent changes in 10.2.

mysql-test/suite/galera/disabled.def

@@ -41,3 +41,6 @@ galera_sst_xtrabackup-v2-options : TODO: Fix test case
 galera_sst_xtrabackup-v2 : MDEV-11208
 galera_sst_xtrabackup-v2_encrypt_with_key : MDEV-11208
 mysql-wsrep#33 : TODO: investigate
+galera_var_innodb_disallow_writes : MDEV-10949
+galera_many_tables_pk : MDEV-11927
+galera_many_tables_nopk : MDEV-11927

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

@@ -7,6 +7,8 @@ SHOW VARIABLES LIKE '%log%bin%';
 Variable_name	Value
 log_bin	OFF
 log_bin_basename	
+log_bin_compress	OFF
+log_bin_compress_min_len	256
 log_bin_index	
 log_bin_trust_function_creators	ON
 sql_log_bin	ON

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

@@ -2,12 +2,12 @@ connection node_1;
 RESET MASTER;
 SET SESSION binlog_format = 'STATEMENT';
 Warnings:
-Warning	1105	MariaDB Galera does not support binlog format: STATEMENT
+Warning	1105	MariaDB Galera and flashback do not support binlog format: STATEMENT
 CREATE TABLE t1 (f1 INTEGER PRIMARY KEY) ENGINE=InnoDB;
 INSERT INTO t1 VALUES (1);
 SET SESSION binlog_format = 'MIXED';
 Warnings:
-Warning	1105	MariaDB Galera does not support binlog format: MIXED
+Warning	1105	MariaDB Galera and flashback do not support binlog format: MIXED
 INSERT INTO t1 VALUES (2);
 SHOW BINLOG EVENTS IN 'mysqld-bin.000001' FROM 256;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info

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

@@ -11,7 +11,7 @@ SET SESSION wsrep_sync_wait=0;
 SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE STATE LIKE '%applied write set%';
 COUNT(*) = 1
 1
-SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE STATE LIKE '%Waiting for table level lock%';
+SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE STATE LIKE 'Waiting for table metadata lock';
 COUNT(*) = 1
 1
 SELECT COUNT(*) = 0 FROM t1;

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

@@ -19,7 +19,8 @@ COUNT(*) = 30000
 SELECT COUNT(DISTINCT f1) = 30000 FROM t1;
 COUNT(DISTINCT f1) = 30000
 1
-SELECT COUNT(*) = 5 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user';
+SELECT COUNT(*) = 5 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE
+USER = 'system user' AND NOT STATE <=> 'InnoDB background thread';
 COUNT(*) = 5
 1
 connection default;

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

 connection node_1;
 SET SESSION binlog_format = 'STATEMENT';
 Warnings:
-Warning	1105	MariaDB Galera does not support binlog format: STATEMENT
+Warning	1105	MariaDB Galera and flashback do not support binlog format: STATEMENT
 CREATE TABLE t1 (f1 INTEGER PRIMARY KEY) ENGINE=InnoDB;
 INSERT INTO t1 VALUES (1);
 SET SESSION binlog_format = 'MIXED';
 Warnings:
-Warning	1105	MariaDB Galera does not support binlog format: MIXED
+Warning	1105	MariaDB Galera and flashback do not support binlog format: MIXED
 INSERT INTO t1 VALUES (2);
 connection node_2;
 SELECT COUNT(*) = 2 FROM t1;

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

 connection node_1;
 SET SESSION binlog_format = 'STATEMENT';
 Warnings:
-Warning	1105	MariaDB Galera does not support binlog format: STATEMENT
+Warning	1105	MariaDB Galera and flashback do not support binlog format: STATEMENT
 CREATE TABLE t1 (f1 INTEGER PRIMARY KEY) ENGINE=InnoDB;
 INSERT INTO t1 VALUES (1);
 SET SESSION binlog_format = 'MIXED';
 Warnings:
-Warning	1105	MariaDB Galera does not support binlog format: MIXED
+Warning	1105	MariaDB Galera and flashback do not support binlog format: MIXED
 INSERT INTO t1 VALUES (2);
 connection node_2;
 SELECT COUNT(*) = 2 FROM t1;

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

@@ -12,7 +12,8 @@ SELECT @@wsrep_slave_threads = 1;
 @@wsrep_slave_threads = 1
 1
 SET GLOBAL wsrep_slave_threads = 1;
-SELECT COUNT(*) = 2 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user';
+SELECT COUNT(*) = 2 FROM INFORMATION_SCHEMA.PROCESSLIST
+WHERE USER = 'system user' AND NOT STATE <=> 'InnoDB background thread';
 COUNT(*) = 2
 1
 SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND STATE LIKE '%wsrep aborter%';
@@ -25,7 +26,8 @@ connection node_2;
 SELECT COUNT(*) = 1 FROM t1;
 COUNT(*) = 1
 1
-SELECT COUNT(*) = @@wsrep_slave_threads + 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user';
+SELECT COUNT(*) = @@wsrep_slave_threads + 1 FROM INFORMATION_SCHEMA.PROCESSLIST
+WHERE USER = 'system user' AND NOT STATE <=> 'InnoDB background thread';
 COUNT(*) = @@wsrep_slave_threads + 1
 1
 SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND STATE LIKE '%wsrep aborter%';
@@ -101,7 +103,8 @@ connection node_2;
 SELECT COUNT(*) = 64 FROM t2;
 COUNT(*) = 64
 1
-SELECT COUNT(*) = @@wsrep_slave_threads + 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user';
+SELECT COUNT(*) = @@wsrep_slave_threads + 1 FROM INFORMATION_SCHEMA.PROCESSLIST
+WHERE USER = 'system user' AND NOT STATE <=> 'InnoDB background thread';
 COUNT(*) = @@wsrep_slave_threads + 1
 1
 SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND STATE LIKE '%wsrep aborter%';

mysql-test/suite/galera/t/galera_kill_applier.test

@@ -7,7 +7,7 @@
 
 --connection node_1
 
---let $applier_thread = `SELECT ID FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND STATE != 'wsrep aborter idle' OR STATE IS NULL LIMIT 1`
+--let $applier_thread = `SELECT ID FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND NOT STATE <=> 'wsrep aborter idle' AND NOT STATE <=> 'InnoDB background thread' LIMIT 1`
 
 --disable_query_log
 --error ER_KILL_DENIED_ERROR,ER_KILL_DENIED_ERROR

mysql-test/suite/galera/t/galera_parallel_apply_lock_table.test

@@ -33,7 +33,7 @@ INSERT INTO t2 VALUES (1);
 --sleep 1
 SET SESSION wsrep_sync_wait=0;
 SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE STATE LIKE '%applied write set%';
-SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE STATE LIKE '%Waiting for table level lock%';
+SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE STATE LIKE 'Waiting for table metadata lock';
 SELECT COUNT(*) = 0 FROM t1;
 SELECT COUNT(*) = 0 FROM t2;
 

mysql-test/suite/galera/t/galera_parallel_autoinc_largetrx.test

@@ -39,7 +39,8 @@ SET GLOBAL wsrep_slave_threads = 4;
 --reap
 SELECT COUNT(*) = 30000 FROM t1;
 SELECT COUNT(DISTINCT f1) = 30000 FROM t1;
-SELECT COUNT(*) = 5 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user';
+SELECT COUNT(*) = 5 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE
+  USER = 'system user' AND NOT STATE <=> 'InnoDB background thread';
 
 --disable_query_log
 --eval SET GLOBAL wsrep_slave_threads = $wsrep_slave_threads_orig;

mysql-test/suite/galera/t/galera_var_slave_threads.test

@@ -22,7 +22,8 @@ SELECT @@wsrep_slave_threads = 1;
 
 SET GLOBAL wsrep_slave_threads = 1;
 # There is a separate wsrep_aborter thread at all times
-SELECT COUNT(*) = 2 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user';
+SELECT COUNT(*) = 2 FROM INFORMATION_SCHEMA.PROCESSLIST
+  WHERE USER = 'system user' AND NOT STATE <=> 'InnoDB background thread';
 SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND STATE LIKE '%wsrep aborter%';
 
 #
@@ -38,7 +39,8 @@ INSERT INTO t1 VALUES (1);
 --connection node_2
 SELECT COUNT(*) = 1 FROM t1;
 
-SELECT COUNT(*) = @@wsrep_slave_threads + 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user';
+SELECT COUNT(*) = @@wsrep_slave_threads + 1 FROM INFORMATION_SCHEMA.PROCESSLIST
+  WHERE USER = 'system user' AND NOT STATE <=> 'InnoDB background thread';
 SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND STATE LIKE '%wsrep aborter%';
 
 #
@@ -60,7 +62,8 @@ while ($count)
 --connection node_2
 SELECT COUNT(*) = 64 FROM t2;
 
-SELECT COUNT(*) = @@wsrep_slave_threads + 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user';
+SELECT COUNT(*) = @@wsrep_slave_threads + 1 FROM INFORMATION_SCHEMA.PROCESSLIST
+  WHERE USER = 'system user' AND NOT STATE <=> 'InnoDB background thread';
 SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND STATE LIKE '%wsrep aborter%';