Adjust tests now that wsrep_OSU_method is a session variable.

MariaDB · May 8, 2015 · 504ff56 · 504ff56
1 parent 00afd63
commit 504ff56
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/mysql-test/suite/galera/r/galera_var_OSU_method.result b/mysql-test/suite/galera/r/galera_var_OSU_method.result
@@ -1,5 +1,5 @@
 CREATE TABLE t1 (f1 INTEGER PRIMARY KEY) Engine=InnoDB;
-SET GLOBAL wsrep_OSU_method = "RSU";
+SET SESSION wsrep_OSU_method = "RSU";
 SET DEBUG_SYNC = 'alter_table_before_open_tables WAIT_FOR continue';
 ALTER TABLE t1 ADD COLUMN f2 INTEGER;;
 SET GLOBAL wsrep_OSU_method = "TOI";

diff --git a/mysql-test/suite/galera/r/galera_var_OSU_method2.result b/mysql-test/suite/galera/r/galera_var_OSU_method2.result
@@ -1,5 +1,5 @@
 CREATE TABLE t1 (f1 INTEGER PRIMARY KEY) Engine=InnoDB;
-SET GLOBAL wsrep_OSU_method = "TOI";
+SET SESSION wsrep_OSU_method = "TOI";
 SET DEBUG_SYNC = 'alter_table_before_open_tables WAIT_FOR continue';
 ALTER TABLE t1 ADD COLUMN f2 INTEGER;;
 SET SESSION wsrep_sync_wait = 0;

diff --git a/mysql-test/suite/galera/t/galera_var_OSU_method.test b/mysql-test/suite/galera/t/galera_var_OSU_method.test
@@ -10,7 +10,7 @@
 CREATE TABLE t1 (f1 INTEGER PRIMARY KEY) Engine=InnoDB;
 
 --connection node_1
-SET GLOBAL wsrep_OSU_method = "RSU";
+SET SESSION wsrep_OSU_method = "RSU";
 SET DEBUG_SYNC = 'alter_table_before_open_tables WAIT_FOR continue';
 --send ALTER TABLE t1 ADD COLUMN f2 INTEGER;
 

diff --git a/mysql-test/suite/galera/t/galera_var_OSU_method2.test b/mysql-test/suite/galera/t/galera_var_OSU_method2.test
@@ -10,7 +10,7 @@
 CREATE TABLE t1 (f1 INTEGER PRIMARY KEY) Engine=InnoDB;
 
 --connection node_1
-SET GLOBAL wsrep_OSU_method = "TOI";
+SET SESSION wsrep_OSU_method = "TOI";
 SET DEBUG_SYNC = 'alter_table_before_open_tables WAIT_FOR continue';
 --send ALTER TABLE t1 ADD COLUMN f2 INTEGER;