From 3889b19f5414f689c8db98b81a19425629c98faa Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <serg@mariadb.org>
Date: Sun, 14 Feb 2016 22:19:27 +0100
Subject: more strict ipv6_ok check in mtr

don't use ipv6 is the check fails for any reason. for example, an
ancient solaris perl didn't have sockaddr_in6() in Socket at all.
---
 mysql-test/suite.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mysql-test/suite.pm')

diff --git a/mysql-test/suite.pm b/mysql-test/suite.pm
index d3285187607..15615c46c81 100644
--- a/mysql-test/suite.pm
+++ b/mysql-test/suite.pm
@@ -35,7 +35,7 @@ sub skip_combinations {
     return 0 unless socket my $sock, PF_INET6, SOCK_STREAM, getprotobyname('tcp');
     # eval{}, if there's no Socket::sockaddr_in6 at all, old Perl installation
     eval { connect $sock, sockaddr_in6(7, Socket::IN6ADDR_LOOPBACK) };
-    return $! != 101;
+    return $@ eq "";
   }
   $skip{'include/check_ipv6.inc'} = 'No IPv6' unless ipv6_ok();
 
-- 
cgit v1.2.1