From: Nirbhay Choubey
Date: September 6 2011 4:27pm
Subject: bzr push into mysql-trunk branch (nirbhay.choubey:3441 to 3442)
List-Archive: http://lists.mysql.com/commits/140942
Message-Id: <201109061627.p86GRI8c009339@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3442 Nirbhay Choubey	2011-09-06 [merge]
      Local merge from mysql-5.5.

    modified:
      scripts/mysql_install_db.pl.in
 3441 Nirbhay Choubey	2011-09-06 [merge]
      Local merge from mysql-5.5.

    modified:
      scripts/mysql_install_db.sh
=== modified file 'scripts/mysql_install_db.pl.in'
--- a/scripts/mysql_install_db.pl.in	2011-07-03 23:56:47 +0000
+++ b/scripts/mysql_install_db.pl.in	2011-09-06 16:23:43 +0000
@@ -61,10 +61,15 @@ Usage: $0 [OPTIONS]
   --cross-bootstrap    For internal use.  Used when building the MySQL system
                        tables on a different host than the target.
   --datadir=path       The path to the MySQL data directory.
+  --defaults-extra-file=name
+                       Read this file after the global files are read.
+  --defaults-file=name Only read default options from the given file name.
   --force              Causes mysql_install_db to run even if DNS does not
                        work.  In that case, grant table entries that normally
                        use hostnames will use IP addresses.
+  --help               Display this help and exit.                     
   --ldata=path         The path to the MySQL data directory. Same as --datadir.
+  --no-defaults        Don't read default options from any option file.
   --rpm                For internal use.  This option is used by RPM files
                        during the MySQL installation process.
   --skip-name-resolve  Use IP addresses rather than hostnames when creating

No bundle (reason: useless for push emails).