Galera MTR Tests: misc test stability fixes

mysql-test/suite/galera/galera_2nodes.cnf

@@ -16,7 +16,7 @@ wsrep-sync-wait=7
 #ist_port=@OPT.port
 #sst_port=@OPT.port
 wsrep-cluster-address=gcomm://
-wsrep_provider_options='base_port=@mysqld.1.#galera_port;gcache.size=10M'
+wsrep_provider_options='repl.causal_read_timeout=PT90S;base_port=@mysqld.1.#galera_port;gcache.size=10M'
 wsrep_node_incoming_address=127.0.0.1:@mysqld.1.port
 wsrep_sst_receive_address='127.0.0.1:@mysqld.1.#sst_port'
 
@@ -25,7 +25,7 @@ wsrep_sst_receive_address='127.0.0.1:@mysqld.1.#sst_port'
 #ist_port=@OPT.port
 #sst_port=@OPT.port
 wsrep_cluster_address='gcomm://127.0.0.1:@mysqld.1.#galera_port'
-wsrep_provider_options='base_port=@mysqld.2.#galera_port;gcache.size=10M'
+wsrep_provider_options='repl.causal_read_timeout=PT90S;base_port=@mysqld.2.#galera_port;gcache.size=10M'
 wsrep_node_incoming_address=127.0.0.1:@mysqld.2.port
 wsrep_sst_receive_address='127.0.0.1:@mysqld.2.#sst_port'
 

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

@@ -24,6 +24,9 @@ f1		CREATE DEFINER=`user1`@`%` FUNCTION `f1`(param INTEGER) RETURNS varchar(200)
     MODIFIES SQL DATA
     COMMENT 'f1_comment'
 RETURN 'abc'	latin1	latin1_swedish_ci	latin1_swedish_ci
+SELECT 1 FROM DUAL;
+1
+1
 SHOW CREATE FUNCTION f1;
 Function	sql_mode	Create Function	character_set_client	collation_connection	Database Collation
 f1		CREATE DEFINER=`user1`@`%` FUNCTION `f1`(param INTEGER) RETURNS varchar(200) CHARSET latin1

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

@@ -33,6 +33,8 @@ RETURN 123;
 SHOW CREATE FUNCTION f1;
 
 --connection node_2
+# Work around codership/mysql-wsrep#228 - SHOW CREATE FUNCTION not covered by wsrep_sync_wait
+SELECT 1 FROM DUAL;
 SHOW CREATE FUNCTION f1;
 
 --connection node_1
@@ -49,9 +51,3 @@ DROP FUNCTION f1;
 DROP FUNCTION f2;
 
 DROP USER 'user1';
-
-
-
-
-
-