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

[Vlad Lesin]

Bug #1322218 fix. See the bug description and commit comments.

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

[Laurynas Biveinis (laurynas-biveinis)]

    - The fix is correct but across all three branches there are two
      distinct bugs fixed. Bug 1322218 should be assigned to one of
      them (e.g. handling of empty mysql.user) and a new one, with an
      upstream bug if applicable, should be logged for the other bug
      (mysql_install_db not handling mysqld startup failure)

review: Needs Information

[Vlad Lesin (vlad-lesin)]

> - The fix is correct but across all three branches there are two
> distinct bugs fixed. Bug 1322218 should be assigned to one of
> them (e.g. handling of empty mysql.user)
Yes, I checked all current versions and they do not contain failed code. So I think this bug can be closed.

> and a new one, with an
> upstream bug if applicable, should be logged for the other bug
> (mysql_install_db not handling mysqld startup failure)
Done, see bug #1382782.

[Vlad Lesin (vlad-lesin)]

> - The fix is correct but across all three branches there are two
> distinct bugs fixed. Bug 1322218 should be assigned to one of
> them (e.g. handling of empty mysql.user)
Yes, I checked all current versions and they do not contain failed code. So I think this bug can be closed.

> and a new one, with an
> upstream bug if applicable, should be logged for the other bug
> (mysql_install_db not handling mysqld startup failure)
Done, see bug #1382782.

Unmerged revisions

618. By Vlad Lesin on 2014-09-08

Bug #1322218 fix.

In the case if mysqld returns error don't continue mysql_install_db script
execution.

The second case when floating point error happens due to dividing by zero when
the number of records in "users" table is null or there is no such table is not
fixed as 5.1 does not contain such code.

=== 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-09-11 10:57:48 +0000
@@ -466,7 +466,20 @@
 
     print PIPE $_;
   }
-  close PIPE;
+  if (!close PIPE)
+  {
+     if ($!)
+     {
+       error($opt, "Error closing mysqld pipe: $!");
+     }
+     else
+     {
+       error($opt,
+         "Installation of system tables failed!",
+         "mysqld returned $? exit status",
+         "Examine the logs in $opt->{ldata} for more information.");
+     }
+  };
   close SQL;
   close SQL2;
 
@@ -487,7 +500,20 @@
     {
       print PIPE $_;
     }
-    close PIPE;
+    if (!close PIPE)
+    {
+      if ($!)
+      {
+        error($opt, "Error closing mysqld pipe: $!");
+      }
+      else
+      {
+        error($opt,
+          "Installation of system tables failed!",
+          "mysqld returned $? exit status",
+          "Examine the logs in $opt->{ldata} for more information.");
+      }
+    };
     close SQL;
 
     report_verbose($opt,"OK");