BUG#25045302: GROUP REPLICATION FAIL TO DETECT THAT PLUGIN IS NOT BUILT

nacarvalho · bjornmu · commit d0048bcbc347 · 2016-11-11T19:38:00.000+01:00
Make all Group Replication tests know that do need to skip when the
plugin is not build, like when cmake -DWITH_RAPID=0 option is used.

(cherry picked from commit 0d842c1cd4d4093caf2787c93a4ff0466c482c6f)
diff --git a/rapid/plugin/group_replication/tests/collections/default.weekly b/rapid/plugin/group_replication/tests/collections/default.weekly
@@ -1,9 +1,9 @@
 perl mysql-test-run.pl --timer --force --parallel=6 --comment=group_replication --vardir=var-group_replication --suite=group_replication --experimental=collections/default.experimental --skip-test-list=collections/disabled-per-push.list --big-test --testcase-timeout=60 --suite-timeout=360
-perl mysql-test-run.pl --timer --force --parallel=6 --comment=group_replication_gtid_assignment_block_size_1 --vardir=var-group_replication_gtid_assignment_block_size_1 --suite=group_replication --experimental=collections/default.experimental --skip-test-list=collections/disabled-per-push.list --big-test --testcase-timeout=60 --suite-timeout=360 --mysqld=--group_replication_gtid_assignment_block_size=1
+perl mysql-test-run.pl --timer --force --parallel=6 --comment=group_replication_gtid_assignment_block_size_1 --vardir=var-group_replication_gtid_assignment_block_size_1 --suite=group_replication --experimental=collections/default.experimental --skip-test-list=collections/disabled-per-push.list --big-test --testcase-timeout=60 --suite-timeout=360 --mysqld=--loose-group_replication_gtid_assignment_block_size=1
 perl mysql-test-run.pl --timer --force --parallel=6 --comment=group_replication_parallel_applier --vardir=var-group_replication_parallel_applier --suite=group_replication --experimental=collections/default.experimental --skip-test-list=collections/disabled-per-push.list --big-test --testcase-timeout=60 --suite-timeout=360 --mysqld=--slave-parallel-workers=4 --mysqld=--slave-parallel-type=logical_clock --mysqld=--slave_preserve_commit_order=ON
-perl mysql-test-run.pl --timer --force --parallel=6 --comment=group_replication_ssl_mode_required --vardir=var-group_replication_ssl_mode_required --suite=group_replication --experimental=collections/default.experimental --skip-test-list=collections/disabled-per-push.list --big-test --testcase-timeout=60 --suite-timeout=360 --mysqld=--group_replication_ssl_mode=REQUIRED
+perl mysql-test-run.pl --timer --force --parallel=6 --comment=group_replication_ssl_mode_required --vardir=var-group_replication_ssl_mode_required --suite=group_replication --experimental=collections/default.experimental --skip-test-list=collections/disabled-per-push.list --big-test --testcase-timeout=60 --suite-timeout=360 --mysqld=--loose-group_replication_ssl_mode=REQUIRED
 perl mysql-test-run.pl --timer --debug-server --force --parallel=6 --comment=group_replication-debug --vardir=var-group_replication-debug --suite=group_replication --experimental=collections/default.experimental --skip-test-list=collections/disabled-per-push.list --big-test --testcase-timeout=60 --suite-timeout=360
-perl mysql-test-run.pl --timer --debug-server --force --parallel=6 --comment=group_replication_gtid_assignment_block_size_1-debug --vardir=var-group_replication_gtid_assignment_block_size_1-debug --suite=group_replication --experimental=collections/default.experimental --skip-test-list=collections/disabled-per-push.list --big-test --testcase-timeout=60 --suite-timeout=360 --mysqld=--group_replication_gtid_assignment_block_size=1
+perl mysql-test-run.pl --timer --debug-server --force --parallel=6 --comment=group_replication_gtid_assignment_block_size_1-debug --vardir=var-group_replication_gtid_assignment_block_size_1-debug --suite=group_replication --experimental=collections/default.experimental --skip-test-list=collections/disabled-per-push.list --big-test --testcase-timeout=60 --suite-timeout=360 --mysqld=--loose-group_replication_gtid_assignment_block_size=1
 perl mysql-test-run.pl --timer --debug-server --force --parallel=6 --comment=group_replication_parallel_applier-debug --vardir=var-group_replication_parallel_applier-debug --suite=group_replication --experimental=collections/default.experimental --skip-test-list=collections/disabled-per-push.list --big-test --testcase-timeout=60 --suite-timeout=360 --mysqld=--slave-parallel-workers=4 --mysqld=--slave-parallel-type=logical_clock --mysqld=--slave_preserve_commit_order=ON
-perl mysql-test-run.pl --timer --debug-server --force --parallel=6 --comment=group_replication_ssl_mode_required-debug --vardir=var-group_replication_ssl_mode_required-debug --suite=group_replication --experimental=collections/default.experimental --skip-test-list=collections/disabled-per-push.list --big-test --testcase-timeout=60 --suite-timeout=360 --mysqld=--group_replication_ssl_mode=REQUIRED
+perl mysql-test-run.pl --timer --debug-server --force --parallel=6 --comment=group_replication_ssl_mode_required-debug --vardir=var-group_replication_ssl_mode_required-debug --suite=group_replication --experimental=collections/default.experimental --skip-test-list=collections/disabled-per-push.list --big-test --testcase-timeout=60 --suite-timeout=360 --mysqld=--loose-group_replication_ssl_mode=REQUIRED
 perl mysql-test-run.pl --timer --debug-server --force --parallel=6 --comment=group_replication_transaction-write-set-extraction_MURMUR32-debug --vardir=var-group_replication_transaction-write-set-extraction_MURMUR32-debug --suite=group_replication --experimental=collections/default.experimental --skip-test-list=collections/disabled-per-push.list --big-test --testcase-timeout=60 --suite-timeout=360 --mysqld=--transaction-write-set-extraction=MURMUR32
diff --git a/rapid/plugin/group_replication/tests/mtr/rpl_1slave_base.cnf b/rapid/plugin/group_replication/tests/mtr/rpl_1slave_base.cnf
@@ -22,10 +22,10 @@ report-user=                root
 master-retry-count=         10
 skip-slave-start
 
-group_replication_start_on_boot= OFF
+loose-group_replication_start_on_boot= OFF
 
-group_replication_single_primary_mode= FALSE
-group_replication_enforce_update_everywhere_checks= TRUE
+loose-group_replication_single_primary_mode= FALSE
+loose-group_replication_enforce_update_everywhere_checks= TRUE
 
 # Directory where slaves find the dumps generated by "load data"
 # on the server. The path need to have constant length otherwise
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_delayed_view_change_write_to_binary_log-master.opt b/rapid/plugin/group_replication/tests/mtr/t/gr_delayed_view_change_write_to_binary_log-master.opt
@@ -1 +1 @@
---group_replication_recovery_complete_at=TRANSACTIONS_CERTIFIED
+--loose-group_replication_recovery_complete_at=TRANSACTIONS_CERTIFIED
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_gtid_assignment_blocks_gaps_in_the_beginning-master.opt b/rapid/plugin/group_replication/tests/mtr/t/gr_gtid_assignment_blocks_gaps_in_the_beginning-master.opt
@@ -1 +1 @@
---group_replication_gtid_assignment_block_size=100
+--loose-group_replication_gtid_assignment_block_size=100
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_gtid_assignment_blocks_gaps_in_the_beginning-slave.opt b/rapid/plugin/group_replication/tests/mtr/t/gr_gtid_assignment_blocks_gaps_in_the_beginning-slave.opt
@@ -1 +1 @@
---group_replication_gtid_assignment_block_size=100
+--loose-group_replication_gtid_assignment_block_size=100
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_key_rotation.test b/rapid/plugin/group_replication/tests/mtr/t/gr_key_rotation.test
@@ -17,8 +17,11 @@
 # 3. Clean Up.
 ###############################################################################
 
-#--let plugins = KEYRING_PLUGIN,GROUP_REPLICATION
-#--source include/check_plugin_dir.inc
+# Ensure that plugin is installed.
+--source ../inc/have_group_replication_plugin_base.inc
+
+--let plugins = KEYRING_PLUGIN,GROUP_REPLICATION
+--source include/check_plugin_dir.inc
 
 --source ../inc/have_group_replication_plugin.inc
 --let $rpl_skip_group_replication_start= 1
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_majority_loss_5_to_2_recovery.cnf b/rapid/plugin/group_replication/tests/mtr/t/gr_majority_loss_5_to_2_recovery.cnf
@@ -4,7 +4,7 @@
 
 [mysqld.2]
 
-group_replication_recovery_retry_count= 86400
+loose-group_replication_recovery_retry_count= 86400
 
 [mysqld.3]
 
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_parallel_applier_indexes_commit_order.cnf b/rapid/plugin/group_replication/tests/mtr/t/gr_parallel_applier_indexes_commit_order.cnf
@@ -1,7 +1,7 @@
 !include ../my.cnf
 
 [mysqld]
-group_replication_auto_increment_increment= 1
+loose-group_replication_auto_increment_increment= 1
 
 [mysqld.3]
 
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_recovery_conflicting_data_failover.cnf b/rapid/plugin/group_replication/tests/mtr/t/gr_recovery_conflicting_data_failover.cnf
@@ -5,7 +5,7 @@
 [mysqld.2]
 
 [mysqld.3]
-group_replication_recovery_retry_count= 86400
+loose-group_replication_recovery_retry_count= 86400
 
 [ENV]
 SERVER_MYPORT_3=		@mysqld.3.port
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_recovery_purged_donor_failover.cnf b/rapid/plugin/group_replication/tests/mtr/t/gr_recovery_purged_donor_failover.cnf
@@ -5,7 +5,7 @@
 [mysqld.2]
 
 [mysqld.3]
-group_replication_recovery_retry_count= 86400
+loose-group_replication_recovery_retry_count= 86400
 
 [ENV]
 SERVER_MYPORT_3=		@mysqld.3.port
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_recovery_ssl_and_ssl_mode-master.opt b/rapid/plugin/group_replication/tests/mtr/t/gr_recovery_ssl_and_ssl_mode-master.opt
@@ -1,2 +1,2 @@
 --no-console --log_error=$MYSQLTEST_VARDIR/tmp/group_replication_recovery_ssl_and_ssl_mode.1.err
---group_replication_ssl_mode=REQUIRED
+--loose-group_replication_ssl_mode=REQUIRED
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_recovery_ssl_and_ssl_mode-slave.opt b/rapid/plugin/group_replication/tests/mtr/t/gr_recovery_ssl_and_ssl_mode-slave.opt
@@ -1,6 +1,6 @@
 --no-console --log_error=$MYSQLTEST_VARDIR/tmp/group_replication_recovery_ssl_and_ssl_mode.2.err
---group_replication_ssl_mode=REQUIRED
---group_replication_recovery_use_ssl=1
---group_replication_recovery_ssl_key=$MYSQL_TEST_DIR/std_data/client-key.pem
---group_replication_recovery_ssl_cert=$MYSQL_TEST_DIR/std_data/client-cert.pem
---group_replication_recovery_ssl_ca=$MYSQL_TEST_DIR/std_data/cacert.pem
+--loose-group_replication_ssl_mode=REQUIRED
+--loose-group_replication_recovery_use_ssl=1
+--loose-group_replication_recovery_ssl_key=$MYSQL_TEST_DIR/std_data/client-key.pem
+--loose-group_replication_recovery_ssl_cert=$MYSQL_TEST_DIR/std_data/client-cert.pem
+--loose-group_replication_recovery_ssl_ca=$MYSQL_TEST_DIR/std_data/cacert.pem
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_start_on_boot-master.opt b/rapid/plugin/group_replication/tests/mtr/t/gr_start_on_boot-master.opt
@@ -1,3 +1,3 @@
---group_replication_start_on_boot=ON
+--loose-group_replication_start_on_boot=ON
 --log_error=$MYSQLTEST_VARDIR/tmp/group_replication_start_on_boot.1.err
 --no-console
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_uninstall_while_disabled-master.opt b/rapid/plugin/group_replication/tests/mtr/t/gr_uninstall_while_disabled-master.opt
@@ -1 +1 @@
---group_replication=OFF
+--loose-group_replication=OFF

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`---group_replication_recovery_complete_at=TRANSACTIONS_CERTIFIED`
	`1`	`+--loose-group_replication_recovery_complete_at=TRANSACTIONS_CERTIFIED`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`---group_replication_gtid_assignment_block_size=100`
	`1`	`+--loose-group_replication_gtid_assignment_block_size=100`