From c26dd8e87b4c4b61d990bf3b7ace0344205a23d1 Mon Sep 17 00:00:00 2001
From: Bjorn Munch <Bjorn.Munch@sun.com>
Date: Wed, 5 Aug 2009 09:41:40 +0200
Subject: [PATCH] Bug #45771 AIX and i5/OS Perl bug: check_socket_path_length
 in MTR fails Bug is actually in Perl Fixed by trapping and ignoring error
 from IO::Socket::UNIX

---
 mysql-test/lib/My/Platform.pm | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/mysql-test/lib/My/Platform.pm b/mysql-test/lib/My/Platform.pm
index 69ffdfbb4ce..7c7741a5c9e 100644
--- a/mysql-test/lib/My/Platform.pm
+++ b/mysql-test/lib/My/Platform.pm
@@ -126,13 +126,29 @@ sub check_socket_path_length {
     die "Could not create UNIX domain socket: $!"
       unless defined $sock;
 
+    my $hostpath = eval {$sock->hostpath()};
+    if ($@) {
+      die unless $@ =~ /^Bad arg length for Socket::unpack_sockaddr_un/;
+
+      # Bug on AIX and i5/OS Perl IO::Socket::UNIX which dies with something
+      # like:
+      #   Bad arg length for Socket::unpack_sockaddr_un, length is 25,
+      #   should be 106 at /path/to/perl/lib/5.8.0/aix/Socket.pm line 380.
+      #
+      # Just fake it that everything is fine
+      $hostpath = $testfile;
+    }
+
     die "UNIX domain socket path was truncated"
-      unless ($testfile eq $sock->hostpath());
+      unless ($testfile eq $hostpath);
 
     $truncated= 0; # Yes, it worked!
 
   };
 
+  die "Unexpected failure when checking socket path length: $@"
+    if $@ and $@ !~ /^UNIX domain socket path was truncated/;
+
   $sock= undef;  # Close socket
   rmtree($tmpdir); # Remove the tempdir and any socket file created
   return $truncated;