From 3fbed5522a69882e3969fd6d62b748dbe9e51658 Mon Sep 17 00:00:00 2001
From: Timothy Smith <timothy.smith@sun.com>
Date: Tue, 3 Nov 2009 14:34:01 -0700
Subject: [PATCH] Add a few comments to clarify do_query() return values in
 mysql_secure_installation.pl

---
 scripts/mysql_secure_installation.pl.in | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/scripts/mysql_secure_installation.pl.in b/scripts/mysql_secure_installation.pl.in
index 255416763ef..25339f9b916 100755
--- a/scripts/mysql_secure_installation.pl.in
+++ b/scripts/mysql_secure_installation.pl.in
@@ -129,7 +129,11 @@ sub do_query {
   my $query   = shift;
   write_file($command, $query);
   my $rv = system("$mysql --defaults-file=$config < $command");
+  # system() returns -1 if exec fails (e.g., command not found, etc.); die
+  # in this case because nothing is going to work
   die "Failed to execute mysql client '$mysql'\n" if $rv == -1;
+  # Return true if query executed OK, or false if there was some problem
+  # (for example, SQL error or wrong password)
   return ($rv == 0 ? 1 : undef);
 }