summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVesa Pentti <vesa.pentti@mariadb.net>2017-12-14 09:19:53 +0000
committerVesa Pentti <vesa.pentti@mariadb.net>2017-12-16 15:34:48 +0000
commitd91d1c8dbc9ae1b3459719cf6b6f21007d9be99a (patch)
treea82596da45e44b9ec97df416d8a48678b308bcb3
parent4ef86e36e8a6546434aec41d4dde21919f034820 (diff)
downloadmariadb-git-d91d1c8dbc9ae1b3459719cf6b6f21007d9be99a.tar.gz
Test cleanup related to MDEV-12501
* Removing unnecessary --plugin-maturity=unknown definitions from tests
-rw-r--r--mysql-test/include/have_plugin_auth.opt2
-rw-r--r--mysql-test/suite/encryption/include/have_example_key_management_plugin.opt1
-rw-r--r--mysql-test/suite/galera/galera_2nodes.cnf1
-rw-r--r--mysql-test/suite/galera/suite.opt1
-rw-r--r--mysql-test/suite/galera_3nodes/galera_3nodes.cnf1
-rw-r--r--mysql-test/suite/innodb/suite.opt1
-rw-r--r--mysql-test/suite/rpl/suite.opt1
-rw-r--r--storage/rocksdb/mysql-test/rocksdb/suite.opt1
-rw-r--r--storage/rocksdb/mysql-test/rocksdb_hotbackup/suite.opt1
-rw-r--r--storage/rocksdb/mysql-test/rocksdb_rpl/suite.opt2
-rw-r--r--storage/rocksdb/mysql-test/rocksdb_stress/suite.opt1
-rw-r--r--storage/rocksdb/mysql-test/rocksdb_sys_vars/suite.opt1
-rw-r--r--storage/rocksdb/mysql-test/storage_engine/suite.opt1
13 files changed, 2 insertions, 13 deletions
diff --git a/mysql-test/include/have_plugin_auth.opt b/mysql-test/include/have_plugin_auth.opt
index 12a9334fa22..0204e148656 100644
--- a/mysql-test/include/have_plugin_auth.opt
+++ b/mysql-test/include/have_plugin_auth.opt
@@ -1 +1 @@
---plugin-load-add=$AUTH_TEST_PLUGIN_SO --plugin-maturity=unknown
+--plugin-load-add=$AUTH_TEST_PLUGIN_SO
diff --git a/mysql-test/suite/encryption/include/have_example_key_management_plugin.opt b/mysql-test/suite/encryption/include/have_example_key_management_plugin.opt
index 66aaef98c54..ce7f1ddef7e 100644
--- a/mysql-test/suite/encryption/include/have_example_key_management_plugin.opt
+++ b/mysql-test/suite/encryption/include/have_example_key_management_plugin.opt
@@ -1,3 +1,2 @@
--plugin-load-add=$EXAMPLE_KEY_MANAGEMENT_SO
--loose-example-key-management
---plugin-maturity=unknown
diff --git a/mysql-test/suite/galera/galera_2nodes.cnf b/mysql-test/suite/galera/galera_2nodes.cnf
index 8de704dbec8..b24f3603894 100644
--- a/mysql-test/suite/galera/galera_2nodes.cnf
+++ b/mysql-test/suite/galera/galera_2nodes.cnf
@@ -4,7 +4,6 @@
[mysqld]
wsrep-on=1
binlog-format=row
-plugin-maturity=unknown
innodb-autoinc-lock-mode=2
default-storage-engine=innodb
wsrep-provider=@ENV.WSREP_PROVIDER
diff --git a/mysql-test/suite/galera/suite.opt b/mysql-test/suite/galera/suite.opt
deleted file mode 100644
index 8374626febe..00000000000
--- a/mysql-test/suite/galera/suite.opt
+++ /dev/null
@@ -1 +0,0 @@
---plugin-maturity=unknown
diff --git a/mysql-test/suite/galera_3nodes/galera_3nodes.cnf b/mysql-test/suite/galera_3nodes/galera_3nodes.cnf
index 48b3c002c04..91aa53ad7b1 100644
--- a/mysql-test/suite/galera_3nodes/galera_3nodes.cnf
+++ b/mysql-test/suite/galera_3nodes/galera_3nodes.cnf
@@ -3,7 +3,6 @@
[mysqld]
binlog-format=row
-plugin-maturity=unknown
innodb-autoinc-lock-mode=2
default-storage-engine=innodb
diff --git a/mysql-test/suite/innodb/suite.opt b/mysql-test/suite/innodb/suite.opt
deleted file mode 100644
index 8374626febe..00000000000
--- a/mysql-test/suite/innodb/suite.opt
+++ /dev/null
@@ -1 +0,0 @@
---plugin-maturity=unknown
diff --git a/mysql-test/suite/rpl/suite.opt b/mysql-test/suite/rpl/suite.opt
deleted file mode 100644
index 8374626febe..00000000000
--- a/mysql-test/suite/rpl/suite.opt
+++ /dev/null
@@ -1 +0,0 @@
---plugin-maturity=unknown
diff --git a/storage/rocksdb/mysql-test/rocksdb/suite.opt b/storage/rocksdb/mysql-test/rocksdb/suite.opt
index e12c09953a5..8ca2405f1ef 100644
--- a/storage/rocksdb/mysql-test/rocksdb/suite.opt
+++ b/storage/rocksdb/mysql-test/rocksdb/suite.opt
@@ -1,2 +1 @@
--plugin-load=$HA_ROCKSDB_SO --default-storage-engine=rocksdb
---plugin-maturity=unknown
diff --git a/storage/rocksdb/mysql-test/rocksdb_hotbackup/suite.opt b/storage/rocksdb/mysql-test/rocksdb_hotbackup/suite.opt
deleted file mode 100644
index 8374626febe..00000000000
--- a/storage/rocksdb/mysql-test/rocksdb_hotbackup/suite.opt
+++ /dev/null
@@ -1 +0,0 @@
---plugin-maturity=unknown
diff --git a/storage/rocksdb/mysql-test/rocksdb_rpl/suite.opt b/storage/rocksdb/mysql-test/rocksdb_rpl/suite.opt
index 47efa90a739..761a2108cec 100644
--- a/storage/rocksdb/mysql-test/rocksdb_rpl/suite.opt
+++ b/storage/rocksdb/mysql-test/rocksdb_rpl/suite.opt
@@ -1 +1 @@
---ignore-db-dirs=.rocksdb --plugin-load=$HA_ROCKSDB_SO --default-storage-engine=rocksdb --plugin-maturity=unknown
+--ignore-db-dirs=.rocksdb --plugin-load=$HA_ROCKSDB_SO --default-storage-engine=rocksdb
diff --git a/storage/rocksdb/mysql-test/rocksdb_stress/suite.opt b/storage/rocksdb/mysql-test/rocksdb_stress/suite.opt
deleted file mode 100644
index 8374626febe..00000000000
--- a/storage/rocksdb/mysql-test/rocksdb_stress/suite.opt
+++ /dev/null
@@ -1 +0,0 @@
---plugin-maturity=unknown
diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/suite.opt b/storage/rocksdb/mysql-test/rocksdb_sys_vars/suite.opt
index 0effe1dadf7..f6640ca596c 100644
--- a/storage/rocksdb/mysql-test/rocksdb_sys_vars/suite.opt
+++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/suite.opt
@@ -1,2 +1 @@
--ignore-db-dirs=#rocksdb --plugin-load=$HA_ROCKSDB_SO
---plugin-maturity=unknown
diff --git a/storage/rocksdb/mysql-test/storage_engine/suite.opt b/storage/rocksdb/mysql-test/storage_engine/suite.opt
index 6ec1095bd9d..e6122c7ed3e 100644
--- a/storage/rocksdb/mysql-test/storage_engine/suite.opt
+++ b/storage/rocksdb/mysql-test/storage_engine/suite.opt
@@ -1,2 +1 @@
--ignore-db-dirs=#rocksdb --plugin-load=$HA_ROCKSDB_SO --binlog_format=ROW --collation-server=latin1_bin --loose-rocksdb_flush_log_at_trx_commit=0
---plugin-maturity=unknown