bzr push into mysql-trunk branch (joerg.bruehe:4645 to 4646)

[Joerg Bruehe]

 4646 Joerg Bruehe	2012-10-10 [merge]
      Merge upwards

    modified:
      scripts/mysql_install_db.pl.in
 4645 Joerg Bruehe	2012-10-09 [merge]
      Merge upwards

    modified:
      scripts/mysql_install_db.pl.in
=== modified file 'scripts/mysql_install_db.pl.in'
--- a/scripts/mysql_install_db.pl.in	2012-10-09 11:07:24 +0000
+++ b/scripts/mysql_install_db.pl.in	2012-10-10 08:24:45 +0000
@@ -74,7 +74,7 @@ Usage: $0 [OPTIONS]
   --ldata=path         The path to the MySQL data directory. Same as --datadir.
   --no-defaults        Don't read default options from any option file.
 EOF1
-  if ( $^O !~ m/^(MSWin32)$/ ) {
+  if ( $^O !~ m/^(MSWin32|cygwin)$/ ) {
     print <<EOF2;
   --random-passwords   Create and set a random password for all root accounts
                        and set the "password expired" flag,
@@ -449,7 +449,7 @@ if ( $opt->{'random-passwords'} ) {
   # and maintain "usage()".
   # Issue 1: random password creation
   # Issue 2: confidential file
-  if ( $^O =~ m/^(MSWin32)$/ ) {
+  if ( $^O =~ m/^(MSWin32|cygwin)$/ ) {
     print "Random password not yet implemented for $^O - option will be ignored\n";
     delete $opt->{'random-passwords'};
   } else {

No bundle (reason: useless for push emails).