Fix test failures.

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

@@ -18,19 +18,22 @@ SET @@session.wsrep_dirty_reads=ON;
 SELECT * FROM t1;
 i
 1
+#
+# MDEV-11016: wsrep_node_is_ready() check is too strict
+#
 SET @@session.wsrep_dirty_reads=OFF;
 SELECT 2;
 2
 2
-SELECT @@max_allowed_packet;
-@@max_allowed_packet
-4194304
 SELECT 2+2 from DUAL;
 2+2
 4
-SELECT sysdate() from DUAL;
-sysdate()
-2016-10-28 23:13:06
+SET @VAR=1;
+SELECT @VAR;
+@VAR
+1
+SELECT @@max_allowed_packet;
+SELECT SYSDATE() from DUAL;
 SELECT * FROM t1;
 i
 1

mysql-test/suite/galera/suite.pm

@@ -37,6 +37,7 @@ push @::global_suppressions,
      qr|WSREP: access file\(.*gvwstate.dat\) failed\(No such file or directory\)|,
      qr|WSREP: no nodes coming from prim view, prim not possible|,
      qr(WSREP: SYNC message from member .* in non-primary configuration. Ignored.),
+     qr(WSREP: discarding established .*),
    );
 
 

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

@@ -39,12 +39,18 @@ SET @@session.wsrep_dirty_reads=ON;
 
 SELECT * FROM t1;
 
-#Select query which does not access table should be allowed MDEV-11016
+--echo #
+--echo # MDEV-11016: wsrep_node_is_ready() check is too strict
+--echo #
 SET @@session.wsrep_dirty_reads=OFF;
 SELECT 2;
-SELECT @@max_allowed_packet;
 SELECT 2+2 from DUAL;
-SELECT sysdate() from DUAL;
+SET @VAR=1;
+SELECT @VAR;
+--disable_result_log
+SELECT @@max_allowed_packet;
+SELECT SYSDATE() from DUAL;
+--enable_result_log
 
 --disable_query_log
 --eval SET @@global.wsrep_cluster_address = '$wsrep_cluster_address_saved'