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

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

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

    modified:
      scripts/mysql_install_db.sh
=== modified file 'scripts/mysql_install_db.sh'
--- a/scripts/mysql_install_db.sh	2011-09-06 15:42:17 +0000
+++ b/scripts/mysql_install_db.sh	2011-09-06 15:59:12 +0000
@@ -47,7 +47,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).