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

Proposed by Sergei Glushchenko
Status: Merged
Approved by: Alexey Kopytov
Approved revision: 497
Merged at revision: 497
Proposed branch: lp:~sergei.glushchenko/percona-server/5.6-ps-bug1240442
Merge into: lp:percona-server/5.6
Diff against target: 13 lines (+2/-1)
1 file modified
Percona-Server/sql/ (+2/-1)
To merge this branch: bzr merge lp:~sergei.glushchenko/percona-server/5.6-ps-bug1240442
Reviewer Review Type Date Requested Status
Alexey Kopytov (community) Approve
Review via email:

Description of the change

     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

Some slave have no libwrap installed.

To post a comment you must log in.
Revision history for this message
Alexey Kopytov (akopytov) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Percona-Server/sql/'
2--- Percona-Server/sql/ 2013-10-29 19:00:08 +0000
3+++ Percona-Server/sql/ 2013-11-17 14:16:26 +0000
4@@ -6506,7 +6506,8 @@
7 {
8- if (mysql_socket_getfd(sock) == mysql_socket_getfd(ip_sock))
9+ if (mysql_socket_getfd(sock) == mysql_socket_getfd(base_ip_sock) ||
10+ mysql_socket_getfd(sock) == mysql_socket_getfd(extra_ip_sock))
11 {
12 struct request_info req;
13 signal(SIGCHLD, SIG_DFL);


People subscribed via source and target branches