From a453a280403faef3377db0441560c57b4ae1235b Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Sun, 14 Jun 2015 17:34:08 +0200 Subject: [PATCH] MDEV-8083 MTR is broken on systems with IPv6 disabled disable IPv6 globally in mysql-test, only use it in dedicated IPv6 tests (where it is enabled per-test) --- mysql-test/include/default_mysqld.cnf | 1 + mysql-test/suite/perfschema/t/socket_instances_func-master.opt | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/mysql-test/include/default_mysqld.cnf b/mysql-test/include/default_mysqld.cnf index 33881666b57..04321475691 100644 --- a/mysql-test/include/default_mysqld.cnf +++ b/mysql-test/include/default_mysqld.cnf @@ -31,6 +31,7 @@ debug-no-sync # Retry bind as this may fail on busy server port-open-timeout=10 +bind-address=127.0.0.1 log-bin-trust-function-creators=1 key_buffer_size= 1M diff --git a/mysql-test/suite/perfschema/t/socket_instances_func-master.opt b/mysql-test/suite/perfschema/t/socket_instances_func-master.opt index ab6ca1731f5..b12a8b3b70e 100644 --- a/mysql-test/suite/perfschema/t/socket_instances_func-master.opt +++ b/mysql-test/suite/perfschema/t/socket_instances_func-master.opt @@ -1 +1 @@ ---skip-name-resolve +--skip-name-resolve --bind-address=*