5 files changed, 9 insertions, 27 deletions
diff --git a/mysql-test/include/check_ipv6.inc b/mysql-test/include/check_ipv6.inc
index 14d04b11e83..f9a61f1661e 100644
--- a/mysql-test/include/check_ipv6.inc
+++ b/mysql-test/include/check_ipv6.inc
@@ -1,14 +1,6 @@
-# Check if ipv6 is available. If not, server is crashing (see BUG#48915).
---disable_query_log
---disable_abort_on_error
-connect (checkcon123456789,::1,root,,test);
-if($mysql_errno)
-{
-skip wrong IP;
-}
-connection default;
-disconnect checkcon123456789;
---enable_abort_on_error
---enable_query_log
-# end check
-
+# Check if ipv6 is available.
+#
+# The real test is done in the mysql-test-run.pl
+# (it has to be done *before* mysqld is started)
+# This file only signals mysql-test-run.pl that ipv6 support is needed
+#
diff --git a/mysql-test/include/default_mysqld.cnf b/mysql-test/include/default_mysqld.cnf
index c5950b3d490..3a8c4c100f2 100644
--- a/mysql-test/include/default_mysqld.cnf
+++ b/mysql-test/include/default_mysqld.cnf
@@ -25,6 +25,9 @@ connect-timeout=            60
 
 plugin-dir=@OPT.plugindir
 
+log-basename=mysqld
+disable-sync-sys
+
 log-bin-trust-function-creators=1
 key_buffer_size=            1M
 sort_buffer=                256K
diff --git a/mysql-test/include/have_archive_plugin.inc b/mysql-test/include/have_archive_plugin.inc
deleted file mode 100644
index 566e2c49211..00000000000
--- a/mysql-test/include/have_archive_plugin.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-if (`select plugin_library IS NULL from information_schema.plugins where plugin_name LIKE '%archive%'`)
-{
-  --skip archive plugin not available
-}
diff --git a/mysql-test/include/have_blackhole_plugin.inc b/mysql-test/include/have_blackhole_plugin.inc
deleted file mode 100644
index b5a3aa2c342..00000000000
--- a/mysql-test/include/have_blackhole_plugin.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-if (`select plugin_library IS NULL from information_schema.plugins where plugin_name LIKE '%blackhole%'`)
-{
-  --skip blackhole plugin not available;
-}
diff --git a/mysql-test/include/have_federated_plugin.inc b/mysql-test/include/have_federated_plugin.inc
deleted file mode 100644
index 5c7549de53f..00000000000
--- a/mysql-test/include/have_federated_plugin.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-if (`select plugin_library IS NULL from information_schema.plugins where plugin_name LIKE '%federated%'`)
-{
-  --skip federated plugin not available
-}
-