Merge lp:~laurynas-biveinis/percona-server/bug1186690-5.1 into lp:percona-server/5.1

[Laurynas Biveinis]

Fix bug 10186690.
http://jenkins.percona.com/job/percona-server-5.1-param/550/

[Stewart Smith (stewart)]

review: Approve

=== modified file 'Percona-Server/mysys/my_net.c'
--- Percona-Server/mysys/my_net.c	2011-07-03 15:47:37 +0000
+++ Percona-Server/mysys/my_net.c	2013-06-02 13:05:35 +0000
@@ -60,9 +60,15 @@
 				   int buflen, int *h_errnop)
 {
   struct hostent *hp;
+  int ret;
   DBUG_ASSERT((size_t) buflen >= sizeof(*result));
-  if (gethostbyname_r(name,result, buffer, (size_t) buflen, &hp, h_errnop))
+  ret= gethostbyname_r(name,result, buffer, (size_t) buflen, &hp, h_errnop);
+  if (unlikely(ret || !hp)) {
+    if (*h_errnop == NETDB_INTERNAL) {
+      *h_errnop= errno;
+    }
     return 0;
+  }
   return hp;
 }