From: Nirbhay Choubey
Date: September 6 2011 4:01pm
Subject: bzr push into mysql-5.5 branch (nirbhay.choubey:3522 to 3523)
List-Archive: http://lists.mysql.com/commits/140938
Message-Id: <201109061601.p86G1Yd5020074@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3523 Nirbhay Choubey	2011-09-06 [merge]
      Local merge from mysql-5.1.

    modified:
      scripts/mysql_install_db.sh
 3522 Nirbhay Choubey	2011-09-06 [merge]
      Local merge of patch for bug#11765888 from mysql-5.1.

    modified:
      scripts/mysql_install_db.sh
=== modified file 'scripts/mysql_install_db.sh'
--- a/scripts/mysql_install_db.sh	2011-09-06 15:39:35 +0000
+++ b/scripts/mysql_install_db.sh	2011-09-06 15:57:32 +0000
@@ -48,7 +48,6 @@ Usage: $0 [OPTIONS]
   --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

No bundle (reason: useless for push emails).