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

Proposed by Vlad Lesin
Status: Merged
Approved by: Laurynas Biveinis
Approved revision: no longer in the source branch.
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) Approve
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.
Revision history for this message
Laurynas Biveinis (laurynas-biveinis) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'Percona-Server/scripts/mysql_install_db.pl.in'
--- Percona-Server/scripts/mysql_install_db.pl.in 2013-02-25 14:26:00 +0000
+++ Percona-Server/scripts/mysql_install_db.pl.in 2014-10-19 19:54:20 +0000
@@ -466,7 +466,20 @@
466466
467 print PIPE $_;467 print PIPE $_;
468 }468 }
469 close PIPE;469 if (!close PIPE)
470 {
471 if ($!)
472 {
473 error($opt, "Error closing mysqld pipe: $!");
474 }
475 else
476 {
477 error($opt,
478 "Installation of system tables failed!",
479 "mysqld returned $? exit status",
480 "Examine the logs in $opt->{ldata} for more information.");
481 }
482 };
470 close SQL;483 close SQL;
471 close SQL2;484 close SQL2;
472485
@@ -487,7 +500,20 @@
487 {500 {
488 print PIPE $_;501 print PIPE $_;
489 }502 }
490 close PIPE;503 if (!close PIPE)
504 {
505 if ($!)
506 {
507 error($opt, "Error closing mysqld pipe: $!");
508 }
509 else
510 {
511 error($opt,
512 "Installation of system tables failed!",
513 "mysqld returned $? exit status",
514 "Examine the logs in $opt->{ldata} for more information.");
515 }
516 };
491 close SQL;517 close SQL;
492518
493 report_verbose($opt,"OK");519 report_verbose($opt,"OK");

Subscribers

People subscribed via source and target branches