Percona Server moved to https://jira.percona.com/projects/PS

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

  1. 5.6-ps-bug1203567
  2. Merge into 5.6
Proposed by Sergei Glushchenko
Status: Merged
Approved by: Stewart Smith
Approved revision: no longer in the source branch.
Merged at revision: 478
Proposed branch: lp:~sergei.glushchenko/percona-server/5.6-ps-bug1203567
Merge into: lp:percona-server/5.6
Diff against target: 30 lines (+13/-2)
1 file modified
Percona-Server/sql/mysqld.cc (+13/-2)
To merge this branch: bzr merge lp:~sergei.glushchenko/percona-server/5.6-ps-bug1203567
Reviewer Review Type Date Requested Status
Stewart Smith (community) Approve
George Ormond Lorch III (community) g2 Approve
Review via email: mp+176922@code.launchpad.net

Description of the change

Merge from 5.5,this diff is smaller, because code has less issues.

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

To post a comment you must log in.
Revision history for this message
Sergei Glushchenko (sergei.glushchenko) wrote :

Updated the branch because 5.5 has been updated. Update introduces nothing new.

Revision history for this message
George Ormond Lorch III (gl-az) :
review: Approve (g2)
Revision history for this message
Stewart Smith (stewart) :
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/mysqld.cc'
2--- Percona-Server/sql/mysqld.cc 2013-08-14 03:57:21 +0000
3+++ Percona-Server/sql/mysqld.cc 2013-08-20 18:00:38 +0000
4@@ -1496,13 +1496,24 @@
5 DBUG_VOID_RETURN;
6 }
7
8+#ifdef HAVE_CLOSE_SERVER_SOCK
9+static void close_socket(MYSQL_SOCKET sock, const char *info)
10+{
11+ DBUG_ENTER("close_socket");
12+
13+ if (mysql_socket_getfd(sock) != INVALID_SOCKET)
14+ {
15+ DBUG_PRINT("info", ("calling shutdown on %s socket", info));
16+ (void) mysql_socket_shutdown(sock, SHUT_RDWR);
17+ }
18+ DBUG_VOID_RETURN;
19+}
20+#endif
21
22 static void close_server_sock()
23 {
24 #ifdef HAVE_CLOSE_SERVER_SOCK
25 DBUG_ENTER("close_server_sock");
26- MYSQL_SOCKET tmp_sock;
27- tmp_sock=ip_sock;
28
29 close_socket(base_ip_sock, "TCP/IP");
30 close_socket(extra_ip_sock, "TCP/IP");

Subscribers

People subscribed via source and target branches