WL#8785: Support multi-state SSL option.

Ramil Kalimullin · bjornmu · commit aab89ab46480 · 2016-01-19T14:50:58.000+01:00
After push test fixes:
  i_rpl.rpl_semi_sync_shutdown
  rpl.rpl_multi_source_mts_reset_worker_info
  rpl.rpl_semi_sync_after_sync
  rpl.rpl_semi_sync_shutdown_hang

(cherry picked from commit 72b8fad8daabbe8243019825cde2038815d66f7d)
diff --git a/mysql-test/suite/rpl/r/rpl_multi_source_mts_reset_worker_info.result b/mysql-test/suite/rpl/r/rpl_multi_source_mts_reset_worker_info.result
@@ -39,7 +39,7 @@ Warnings:
 Note	1759	Sending passwords in plain text without SSL/TLS is extremely insecure.
 Note	1760	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
 include/assert.inc [Two workers are expected to survive the last RESET SLAVE]
-START SLAVE;
+include/start_slave.inc
 
 === RESTART SERVER ===
 include/rpl_restart_server.inc [server_number=1 parameters: --gtid-mode=off --master-info-repository=TABLE --relay-log-info-repository=TABLE]
diff --git a/mysql-test/suite/rpl/t/rpl_multi_source_mts_reset_worker_info.test b/mysql-test/suite/rpl/t/rpl_multi_source_mts_reset_worker_info.test
@@ -55,7 +55,8 @@ eval CHANGE MASTER TO MASTER_HOST='localhost', MASTER_USER='root', MASTER_PORT=$
 --let $assert_cond= `SELECT COUNT(*) = 0 FROM mysql.slave_worker_info`
 --source include/assert.inc
 
-START SLAVE;
+--let $rpl_channel_name= ch_b
+--source include/start_slave.inc
 
 #
 # Testing Worker info table after server restarts.
diff --git a/mysql-test/suite/rpl/t/rpl_semi_sync_after_sync-master.opt b/mysql-test/suite/rpl/t/rpl_semi_sync_after_sync-master.opt
@@ -1 +1 @@
-$SEMISYNC_PLUGIN_OPT
+$SEMISYNC_PLUGIN_OPT --skip-ssl
diff --git a/mysql-test/suite/rpl/t/rpl_semi_sync_shutdown_hang-master.opt b/mysql-test/suite/rpl/t/rpl_semi_sync_shutdown_hang-master.opt
@@ -1 +1 @@
-$SEMISYNC_PLUGIN_OPT
+$SEMISYNC_PLUGIN_OPT --skip-ssl

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,8 @@ eval CHANGE MASTER TO MASTER_HOST='localhost', MASTER_USER='root', MASTER_PORT=$`
`55`	`55`	--let $assert_cond= `SELECT COUNT(*) = 0 FROM mysql.slave_worker_info`
`56`	`56`	`--source include/assert.inc`
`57`	`57`
`58`		`-START SLAVE;`
	`58`	`+--let $rpl_channel_name= ch_b`
	`59`	`+--source include/start_slave.inc`
`59`	`60`
`60`	`61`	`#`
`61`	`62`	`# Testing Worker info table after server restarts.`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-$SEMISYNC_PLUGIN_OPT`
	`1`	`+$SEMISYNC_PLUGIN_OPT --skip-ssl`