summaryrefslogtreecommitdiff
path: root/mysql-test/suite/sys_vars/r/slave_parallel_mode_basic.result
diff options
context:
space:
mode:
Diffstat (limited to 'mysql-test/suite/sys_vars/r/slave_parallel_mode_basic.result')
-rw-r--r--mysql-test/suite/sys_vars/r/slave_parallel_mode_basic.result30
1 files changed, 15 insertions, 15 deletions
diff --git a/mysql-test/suite/sys_vars/r/slave_parallel_mode_basic.result b/mysql-test/suite/sys_vars/r/slave_parallel_mode_basic.result
index e997cc49f12..e4c9134374a 100644
--- a/mysql-test/suite/sys_vars/r/slave_parallel_mode_basic.result
+++ b/mysql-test/suite/sys_vars/r/slave_parallel_mode_basic.result
@@ -1,8 +1,8 @@
-SET SESSION slave_parallel_mode= '';
+SET SESSION slave_parallel_mode= none;
ERROR HY000: Variable 'slave_parallel_mode' is a GLOBAL variable and should be set with SET GLOBAL
SELECT @@slave_parallel_mode;
@@slave_parallel_mode
-domain
+minimal
SELECT @@m1.slave_parallel_mode;
@@m1.slave_parallel_mode
NULL
@@ -12,39 +12,39 @@ Warning 1617 There is no master connection 'm1'
CHANGE MASTER TO master_host='127.0.0.1', master_port=3310, master_user='root';
SELECT @@``.slave_parallel_mode;
@@``.slave_parallel_mode
-domain
+minimal
SELECT @@slave_parallel_mode;
@@slave_parallel_mode
-domain
-Parallel_Mode = 'domain'
+minimal
+Parallel_Mode = 'minimal'
SELECT @@m2.slave_parallel_mode;
@@m2.slave_parallel_mode
NULL
Warnings:
Warning 1617 There is no master connection 'm2'
Warning 1617 There is no master connection 'm2'
-SET GLOBAL m2.slave_parallel_mode = '';
+SET GLOBAL m2.slave_parallel_mode = none;
Warnings:
Warning 1617 There is no master connection 'm2'
CHANGE MASTER 'm1' TO master_host='127.0.0.1', master_port=3311, master_user='root';
SELECT @@m1.slave_parallel_mode;
@@m1.slave_parallel_mode
-transactional
-Parallel_Mode = 'domain'
-SET GLOBAL m1.slave_parallel_mode= follow_master_commit;
-Parallel_Mode = 'domain'
+optimistic
+Parallel_Mode = 'minimal'
+SET GLOBAL m1.slave_parallel_mode= conservative;
+Parallel_Mode = 'minimal'
SET default_master_connection= 'm1';
SELECT @@slave_parallel_mode;
@@slave_parallel_mode
-follow_master_commit
-SET GLOBAL slave_parallel_mode= waiting;
+conservative
+SET GLOBAL slave_parallel_mode= aggressive;
SELECT @@slave_parallel_mode;
@@slave_parallel_mode
-waiting
-Parallel_Mode = 'waiting'
+aggressive
+Parallel_Mode = 'aggressive'
SET default_master_connection= '';
SELECT @@slave_parallel_mode;
@@slave_parallel_mode
-domain
+minimal
RESET SLAVE ALL;
RESET SLAVE 'm1' ALL;