Skip to content

Commit

Permalink
more strict ipv6_ok check in mtr
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
vuvova committed Feb 15, 2016
1 parent 8f5030e commit 3889b19
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion mysql-test/suite.pm
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down

0 comments on commit 3889b19

Please sign in to comment.