Merge lp:~sergei.glushchenko/percona-server/5.6-ps-bug1240442 into lp:percona-server/5.6

[Sergei Glushchenko]

     Bug 1240442: Compilation error with -DWITH_LIBWRAP=ON

     Error was because instead of ip_sock we now have base_ip_sock and
     extra_ip_sock, fixed by checking for both of them instead of
     ip_sock.

http://jenkins.percona.com/view/PS%205.6/job/percona-server-5.6-param/410/

Some slave have no libwrap installed.

[Alexey Kopytov (akopytov)]

review: Approve

=== modified file 'Percona-Server/sql/mysqld.cc'
--- Percona-Server/sql/mysqld.cc	2013-10-29 19:00:08 +0000
+++ Percona-Server/sql/mysqld.cc	2013-11-17 14:16:26 +0000
@@ -6506,7 +6506,8 @@
 
 #ifdef HAVE_LIBWRAP
     {
-      if (mysql_socket_getfd(sock) == mysql_socket_getfd(ip_sock))
+      if (mysql_socket_getfd(sock) == mysql_socket_getfd(base_ip_sock) ||
+          mysql_socket_getfd(sock) == mysql_socket_getfd(extra_ip_sock))
       {
         struct request_info req;
         signal(SIGCHLD, SIG_DFL);