Bug#25240784 - ROLES_XPLUGIN-MASTER.OPT IS NOT NEEDED

lkotula · lkotula · commit 879148b2af4d · 2017-02-28T15:02:31.000+01:00
Description
===========
Tests that use "-masert.opt" files to pass some extra options to MySQL Server
do not need to have "--plugin-dir" option. It was moved to "suite.opt" file
which is applied to every test in "X" suite.

Fix
===
* Removed plugin directory option from per-test-case "opt" files.
* Removed "opt" files which have only plugin dir option.

RB:15477
Reviewed-by: Andrzej Religa &lt;andrzej.reliaga@oracle.com&gt;
diff --git a/rapid/plugin/x/tests/mtr/t/binary_log-master.opt b/rapid/plugin/x/tests/mtr/t/binary_log-master.opt
@@ -1,3 +1,2 @@
---plugin_dir=$MYSQLXPLUGIN_DIR
 --performance_schema_events_waits_history_long_size=400000
 --log-bin=mysqld-bin
diff --git a/rapid/plugin/x/tests/mtr/t/capabilities-master.opt b/rapid/plugin/x/tests/mtr/t/capabilities-master.opt
@@ -1,2 +1 @@
---plugin_dir=$MYSQLXPLUGIN_DIR
 --skip-ssl
diff --git a/rapid/plugin/x/tests/mtr/t/connection_nonssl-master.opt b/rapid/plugin/x/tests/mtr/t/connection_nonssl-master.opt
@@ -1,2 +1 @@
---plugin_dir=$MYSQLXPLUGIN_DIR
 --skip-ssl
diff --git a/rapid/plugin/x/tests/mtr/t/connection_openssl-master.opt b/rapid/plugin/x/tests/mtr/t/connection_openssl-master.opt
@@ -1,4 +1,3 @@
---plugin_dir=$MYSQLXPLUGIN_DIR
 --loose-mysqlx-ssl-key=$MYSQL_TEST_DIR/std_data/server-key.pem
 --loose-mysqlx-ssl-cert=$MYSQL_TEST_DIR/std_data/server-cert.pem
 --loose-mysqlx-ssl-ca=$MYSQL_TEST_DIR/std_data/cacert.pem
diff --git a/rapid/plugin/x/tests/mtr/t/connection_skip_networking_win-master.opt b/rapid/plugin/x/tests/mtr/t/connection_skip_networking_win-master.opt
@@ -1,2 +1 @@
---plugin_dir=$MYSQLXPLUGIN_DIR
 --loose-enable-named-pipe
diff --git a/rapid/plugin/x/tests/mtr/t/connection_tls_version-master.opt b/rapid/plugin/x/tests/mtr/t/connection_tls_version-master.opt
@@ -1,4 +1,3 @@
---plugin_dir=$MYSQLXPLUGIN_DIR
 --loose-mysqlx-ssl-key=$MYSQL_TEST_DIR/std_data/server-key.pem
 --loose-mysqlx-ssl-cert=$MYSQL_TEST_DIR/std_data/server-cert.pem
 --loose-mysqlx-ssl-ca=$MYSQL_TEST_DIR/std_data/cacert.pem
diff --git a/rapid/plugin/x/tests/mtr/t/connection_yassl-master.opt b/rapid/plugin/x/tests/mtr/t/connection_yassl-master.opt
@@ -1,4 +1,3 @@
---plugin_dir=$MYSQLXPLUGIN_DIR
 --loose-mysqlx-ssl-key=$MYSQL_TEST_DIR/std_data/server-key.pem
 --loose-mysqlx-ssl-cert=$MYSQL_TEST_DIR/std_data/server-cert.pem
 --loose-mysqlx-ssl-ca=$MYSQL_TEST_DIR/std_data/cacert.pem
diff --git a/rapid/plugin/x/tests/mtr/t/crud_create_view-master.opt b/rapid/plugin/x/tests/mtr/t/crud_create_view-master.opt
diff --git a/rapid/plugin/x/tests/mtr/t/log_encrypt_xplugin-master.opt b/rapid/plugin/x/tests/mtr/t/log_encrypt_xplugin-master.opt
diff --git a/rapid/plugin/x/tests/mtr/t/message_protobuf_nested-master.opt b/rapid/plugin/x/tests/mtr/t/message_protobuf_nested-master.opt
diff --git a/rapid/plugin/x/tests/mtr/t/notices_disable-master.opt b/rapid/plugin/x/tests/mtr/t/notices_disable-master.opt
@@ -1,2 +1 @@
---plugin_dir=$MYSQLXPLUGIN_DIR
 --thread_stack=400000
diff --git a/rapid/plugin/x/tests/mtr/t/notices_disable_mysqlx-master.opt b/rapid/plugin/x/tests/mtr/t/notices_disable_mysqlx-master.opt
@@ -1,2 +1 @@
---plugin_dir=$MYSQLXPLUGIN_DIR
 --thread_stack=400000
diff --git a/rapid/plugin/x/tests/mtr/t/notices_enable-master.opt b/rapid/plugin/x/tests/mtr/t/notices_enable-master.opt
@@ -1,2 +1 @@
---plugin_dir=$MYSQLXPLUGIN_DIR
 ${?PB_HOST_SPECIFIC_MYSQLD_ARGS} --thread_stack=655360
diff --git a/rapid/plugin/x/tests/mtr/t/notices_enable_mysqlx-master.opt b/rapid/plugin/x/tests/mtr/t/notices_enable_mysqlx-master.opt
@@ -1,2 +1 @@
---plugin_dir=$MYSQLXPLUGIN_DIR
 ${?PB_HOST_SPECIFIC_MYSQLD_ARGS} --thread_stack=655360
diff --git a/rapid/plugin/x/tests/mtr/t/performance_schema-master.opt b/rapid/plugin/x/tests/mtr/t/performance_schema-master.opt
@@ -1,4 +1,3 @@
---plugin_dir=$MYSQLXPLUGIN_DIR
 --performance_schema=ON
 --performance-schema-instrument='%/mysqlx/%=COUNTED'
 --performance_schema_events_waits_history_long_size=600000
diff --git a/rapid/plugin/x/tests/mtr/t/performance_schema_sockets-master.opt b/rapid/plugin/x/tests/mtr/t/performance_schema_sockets-master.opt
@@ -1,4 +1,3 @@
---plugin_dir=$MYSQLXPLUGIN_DIR
 --performance_schema=ON
 --performance-schema-instrument='%/mysqlx/%=COUNTED'
 --performance_schema_events_waits_history_long_size=600000
diff --git a/rapid/plugin/x/tests/mtr/t/performance_schema_threads-master.opt b/rapid/plugin/x/tests/mtr/t/performance_schema_threads-master.opt
@@ -1,4 +1,3 @@
---plugin_dir=$MYSQLXPLUGIN_DIR
 --loose-mysqlx-idle-worker-thread-timeout=1
 --performance_schema=ON
 --performance-schema-instrument='%/mysqlx/%=COUNTED'
diff --git a/rapid/plugin/x/tests/mtr/t/regression-master.opt b/rapid/plugin/x/tests/mtr/t/regression-master.opt
@@ -1,2 +1 @@
---plugin_dir=$MYSQLXPLUGIN_DIR
 --loose-mysqlx-socket=
diff --git a/rapid/plugin/x/tests/mtr/t/roles_xplugin-master.opt b/rapid/plugin/x/tests/mtr/t/roles_xplugin-master.opt
diff --git a/rapid/plugin/x/tests/mtr/t/status_variable_errors_unknown_message_type-master.opt b/rapid/plugin/x/tests/mtr/t/status_variable_errors_unknown_message_type-master.opt
diff --git a/rapid/plugin/x/tests/mtr/t/status_variables-master.opt b/rapid/plugin/x/tests/mtr/t/status_variables-master.opt
@@ -1,2 +1 @@
---plugin_dir=$MYSQLXPLUGIN_DIR
 --skip-ssl
diff --git a/rapid/plugin/x/tests/mtr/t/system_variable_max_allowed_packet-master.opt b/rapid/plugin/x/tests/mtr/t/system_variable_max_allowed_packet-master.opt

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,2 @@`
`1`		`---plugin_dir=$MYSQLXPLUGIN_DIR`
`2`	`1`	`--performance_schema_events_waits_history_long_size=400000`
`3`	`2`	`--log-bin=mysqld-bin`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1 @@`
`1`		`---plugin_dir=$MYSQLXPLUGIN_DIR`
`2`	`1`	`--skip-ssl`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`---plugin_dir=$MYSQLXPLUGIN_DIR`
`2`	`1`	`--loose-mysqlx-ssl-key=$MYSQL_TEST_DIR/std_data/server-key.pem`
`3`	`2`	`--loose-mysqlx-ssl-cert=$MYSQL_TEST_DIR/std_data/server-cert.pem`
`4`	`3`	`--loose-mysqlx-ssl-ca=$MYSQL_TEST_DIR/std_data/cacert.pem`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1 @@`
`1`		`---plugin_dir=$MYSQLXPLUGIN_DIR`
`2`	`1`	`--loose-enable-named-pipe`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1 @@`
`1`		`---plugin_dir=$MYSQLXPLUGIN_DIR`
`2`	`1`	`--thread_stack=400000`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1 @@`
`1`		`---plugin_dir=$MYSQLXPLUGIN_DIR`
`2`	`1`	`${?PB_HOST_SPECIFIC_MYSQLD_ARGS} --thread_stack=655360`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`---plugin_dir=$MYSQLXPLUGIN_DIR`
`2`	`1`	`--loose-mysqlx-idle-worker-thread-timeout=1`
`3`	`2`	`--performance_schema=ON`
`4`	`3`	`--performance-schema-instrument='%/mysqlx/%=COUNTED'`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1 @@`
`1`		`---plugin_dir=$MYSQLXPLUGIN_DIR`
`2`	`1`	`--loose-mysqlx-socket=`