bzr push into mysql-5.1 branch (nirbhay.choubey:3600 to 3601)

[Nirbhay Choubey]

 3601 Nirbhay Choubey	2011-09-06
      Removing a stray line, went into the last push.

    modified:
      scripts/mysql_install_db.sh
 3600 Nirbhay Choubey	2011-09-06
      Bug#11765888 58898: MYSQL_INSTALL_DB: NOT ALL OPTIONS DOCUMENTED
                          (EG: --DEFAULTS-FILE )
      
      Added help message for the missing options (--no-defaults,
      --defaults-file and --defaults-extra-file).
     @ scripts/mysql_install_db.sh
        Bug#11765888 58898: MYSQL_INSTALL_DB: NOT ALL OPTIONS DOCUMENTED
                            (EG: --DEFAULTS-FILE )
        
        Added help message for the missing options (--no-defaults,
        --defaults-file and --defaults-extra-file).

    modified:
      scripts/mysql_install_db.sh
=== modified file 'scripts/mysql_install_db.sh'
--- a/scripts/mysql_install_db.sh	2011-09-06 15:36:09 +0000
+++ b/scripts/mysql_install_db.sh	2011-09-06 15:55:28 +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).