Merge lp:~vlad-lesin/percona-server/5.1-bug-1382782 into lp:percona-server/5.1

Proposed by Vlad Lesin on 2014-10-19
Status: Merged
Approved by: Laurynas Biveinis on 2014-10-20
Approved revision: 624
Merged at revision: 625
Proposed branch: lp:~vlad-lesin/percona-server/5.1-bug-1382782
Merge into: lp:percona-server/5.1
Diff against target: 47 lines (+28/-2)
1 file modified
Percona-Server/scripts/mysql_install_db.pl.in (+28/-2)
To merge this branch: bzr merge lp:~vlad-lesin/percona-server/5.1-bug-1382782
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) 2014-10-19 Approve on 2014-10-20
Review via email: mp+238832@code.launchpad.net

Description of the change

Bug #1382782 fix.

The return value of 'close' perl function is checked to detect error
on mysqld execution during creating and filling system tables from
mysql_install_db script.

http://jenkins.percona.com/view/PS%205.1/job/percona-server-5.1-param/612/

To post a comment you must log in.
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Percona-Server/scripts/mysql_install_db.pl.in'
2--- Percona-Server/scripts/mysql_install_db.pl.in 2013-02-25 14:26:00 +0000
3+++ Percona-Server/scripts/mysql_install_db.pl.in 2014-10-19 19:54:20 +0000
4@@ -466,7 +466,20 @@
5
6 print PIPE $_;
7 }
8- close PIPE;
9+ if (!close PIPE)
10+ {
11+ if ($!)
12+ {
13+ error($opt, "Error closing mysqld pipe: $!");
14+ }
15+ else
16+ {
17+ error($opt,
18+ "Installation of system tables failed!",
19+ "mysqld returned $? exit status",
20+ "Examine the logs in $opt->{ldata} for more information.");
21+ }
22+ };
23 close SQL;
24 close SQL2;
25
26@@ -487,7 +500,20 @@
27 {
28 print PIPE $_;
29 }
30- close PIPE;
31+ if (!close PIPE)
32+ {
33+ if ($!)
34+ {
35+ error($opt, "Error closing mysqld pipe: $!");
36+ }
37+ else
38+ {
39+ error($opt,
40+ "Installation of system tables failed!",
41+ "mysqld returned $? exit status",
42+ "Examine the logs in $opt->{ldata} for more information.");
43+ }
44+ };
45 close SQL;
46
47 report_verbose($opt,"OK");

Subscribers

People subscribed via source and target branches