diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-02-15 22:50:59 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-02-15 22:50:59 +0100 |
| commit | 271fed41061e25faa47b7a28108cf101ebb3551d (patch) | |
| tree | 733bf84d468a1d47c71c87cfcee33098a090e3c5 /mysql-test/suite.pm | |
| parent | ff26d93a8c25d667709180ad13a090309631990d (diff) | |
| parent | e1385f2083f782d7064db3c0059fcca45bfcb2a4 (diff) | |
| download | mariadb-git-271fed41061e25faa47b7a28108cf101ebb3551d.tar.gz | |
Merge branch '5.5' into 10.0
Diffstat (limited to 'mysql-test/suite.pm')
| -rw-r--r-- | mysql-test/suite.pm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/suite.pm b/mysql-test/suite.pm index bef37ac4d04..199cfba3b8f 100644 --- a/mysql-test/suite.pm +++ b/mysql-test/suite.pm @@ -48,7 +48,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(); |