bzr commit into mysql-5.1-bugteam branch (jimw:3124) Bug#46842

[Jim Winstead]

#At file:///Users/jimw/my/mysql-5.1--bug46842/ based on revid:luis.soares@stripped

 3124 Jim Winstead	2009-09-14
      mysql_secure_installation did not read the global options file, which made it
      impossible to specify options such as a non-default socket location.
      (Bug #46842)

    modified:
      scripts/mysql_secure_installation.pl.in
      scripts/mysql_secure_installation.sh
=== modified file 'scripts/mysql_secure_installation.pl.in'
--- a/scripts/mysql_secure_installation.pl.in	2007-12-28 21:58:54 +0000
+++ b/scripts/mysql_secure_installation.pl.in	2009-09-14 21:13:45 +0000
@@ -67,7 +67,7 @@ sub prepare {
 sub do_query {
   my $query   = shift;
   write_file($command, $query);
-  system("mysql --defaults-file=$config < $command");
+  system("mysql --defaults-extra-file=$config < $command");
   return $?;
 }
 

=== modified file 'scripts/mysql_secure_installation.sh'
--- a/scripts/mysql_secure_installation.sh	2007-01-01 04:31:23 +0000
+++ b/scripts/mysql_secure_installation.sh	2009-09-14 21:13:45 +0000
@@ -39,7 +39,7 @@ prepare() {
 
 do_query() {
     echo $1 >$command
-    mysql --defaults-file=$config <$command
+    mysql --defaults-extra-file=$config <$command
     return $?
 }
 


Attachment: [text/bzr-bundle] bzr/[e-mail]