From c56483d972d023105fbcb0f47af0042ee092657c Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Fri, 13 Jan 2012 15:52:19 +0100 Subject: [PATCH] remove duplicate .opt with AUTH_PLUGIN_SO --- .../{t/auth_rpl-master.opt => include/have_plugin_auth.opt} | 0 mysql-test/t/auth_rpl-slave.opt | 1 - mysql-test/t/mysql_client_test-master.opt | 1 - mysql-test/t/plugin_auth-master.opt | 1 - mysql-test/t/plugin_auth_qa-master.opt | 1 - mysql-test/t/plugin_auth_qa_1-master.opt | 1 - 6 files changed, 5 deletions(-) rename mysql-test/{t/auth_rpl-master.opt => include/have_plugin_auth.opt} (100%) delete mode 100644 mysql-test/t/plugin_auth-master.opt delete mode 100644 mysql-test/t/plugin_auth_qa-master.opt delete mode 100644 mysql-test/t/plugin_auth_qa_1-master.opt diff --git a/mysql-test/t/auth_rpl-master.opt b/mysql-test/include/have_plugin_auth.opt similarity index 100% rename from mysql-test/t/auth_rpl-master.opt rename to mysql-test/include/have_plugin_auth.opt diff --git a/mysql-test/t/auth_rpl-slave.opt b/mysql-test/t/auth_rpl-slave.opt index ca6eee95ded..1e471f65645 100644 --- a/mysql-test/t/auth_rpl-slave.opt +++ b/mysql-test/t/auth_rpl-slave.opt @@ -1,2 +1 @@ --master-retry-count=1 ---plugin-load=$AUTH_TEST_PLUGIN_SO diff --git a/mysql-test/t/mysql_client_test-master.opt b/mysql-test/t/mysql_client_test-master.opt index d2db22b8634..69debb24dae 100644 --- a/mysql-test/t/mysql_client_test-master.opt +++ b/mysql-test/t/mysql_client_test-master.opt @@ -1,3 +1,2 @@ --log=$MYSQLTEST_VARDIR/log/master.log --log-output=FILE,TABLE ---plugin-load=$AUTH_TEST_PLUGIN_SO diff --git a/mysql-test/t/plugin_auth-master.opt b/mysql-test/t/plugin_auth-master.opt deleted file mode 100644 index ff91abb1bef..00000000000 --- a/mysql-test/t/plugin_auth-master.opt +++ /dev/null @@ -1 +0,0 @@ ---plugin-load=$AUTH_TEST_PLUGIN_SO diff --git a/mysql-test/t/plugin_auth_qa-master.opt b/mysql-test/t/plugin_auth_qa-master.opt deleted file mode 100644 index ff91abb1bef..00000000000 --- a/mysql-test/t/plugin_auth_qa-master.opt +++ /dev/null @@ -1 +0,0 @@ ---plugin-load=$AUTH_TEST_PLUGIN_SO diff --git a/mysql-test/t/plugin_auth_qa_1-master.opt b/mysql-test/t/plugin_auth_qa_1-master.opt deleted file mode 100644 index ff91abb1bef..00000000000 --- a/mysql-test/t/plugin_auth_qa_1-master.opt +++ /dev/null @@ -1 +0,0 @@ ---plugin-load=$AUTH_TEST_PLUGIN_SO