From 5d531f07bfb39dce84cb1e42c36f8b01e331e37f Mon Sep 17 00:00:00 2001 From: Philip Stoev Date: Wed, 1 Jul 2015 03:13:04 -0700 Subject: [PATCH] Galera MTR Tests: Use SET GLOBAL when setting wsrep_replicate_myisam, as it is a GLOBAL variable in MySQL Galera Cluster and SESSION in Percona XTraDB Cluster --- mysql-test/suite/galera/r/galera_flush.result | 2 +- mysql-test/suite/galera/t/galera_flush.test | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mysql-test/suite/galera/r/galera_flush.result b/mysql-test/suite/galera/r/galera_flush.result index 2cc1e944371..5f15bee14a8 100644 --- a/mysql-test/suite/galera/r/galera_flush.result +++ b/mysql-test/suite/galera/r/galera_flush.result @@ -8,7 +8,7 @@ SET GLOBAL wsrep_replicate_myisam = TRUE; INSERT INTO mysql.user VALUES('localhost','user1',PASSWORD('pass1'), 'Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0,'mysql_native_password','','N','N'); FLUSH PRIVILEGES; DELETE FROM mysql.user WHERE user = 'user1'; -SET SESSION wsrep_replicate_myisam = FALSE; +SET GLOBAL wsrep_replicate_myisam = FALSE; FLUSH PRIVILEGES; FLUSH QUERY CACHE; wsrep_last_committed_diff diff --git a/mysql-test/suite/galera/t/galera_flush.test b/mysql-test/suite/galera/t/galera_flush.test index 7d0132fa6cc..b773af03592 100644 --- a/mysql-test/suite/galera/t/galera_flush.test +++ b/mysql-test/suite/galera/t/galera_flush.test @@ -39,7 +39,7 @@ FLUSH PRIVILEGES; --connect node_2a, 127.0.0.1, user1, pass1, test, $NODE_MYPORT_2 --connection node_1 DELETE FROM mysql.user WHERE user = 'user1'; -SET SESSION wsrep_replicate_myisam = FALSE; +SET GLOBAL wsrep_replicate_myisam = FALSE; FLUSH PRIVILEGES;