summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2012-01-13 15:52:19 +0100
committerSergei Golubchik <sergii@pisem.net>2012-01-13 15:52:19 +0100
commitc56483d972d023105fbcb0f47af0042ee092657c (patch)
tree7eea67c7b61f49dbc4cc05fbfe7eddd808cff0b5 /mysql-test
parent4f435bddfd44d40999f88685c61cc04e319d8d6c (diff)
downloadmariadb-git-c56483d972d023105fbcb0f47af0042ee092657c.tar.gz
remove duplicate .opt with AUTH_PLUGIN_SO
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/include/have_plugin_auth.opt (renamed from mysql-test/t/auth_rpl-master.opt)0
-rw-r--r--mysql-test/t/auth_rpl-slave.opt1
-rw-r--r--mysql-test/t/mysql_client_test-master.opt1
-rw-r--r--mysql-test/t/plugin_auth-master.opt1
-rw-r--r--mysql-test/t/plugin_auth_qa-master.opt1
-rw-r--r--mysql-test/t/plugin_auth_qa_1-master.opt1
6 files changed, 0 insertions, 5 deletions
diff --git a/mysql-test/t/auth_rpl-master.opt b/mysql-test/include/have_plugin_auth.opt
index ff91abb1bef..ff91abb1bef 100644
--- a/mysql-test/t/auth_rpl-master.opt
+++ b/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