bzr push into mysql-5.1 branch (nirbhay.choubey:3599 to 3600) Bug#11765888

[Nirbhay Choubey]

 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
 3599 Marko Mäkelä	2011-09-06
      Bug #12950803 62294: BUF_BUDDY_RELOCATE CALLS GETTIMEOFDAY ...
      
      buf_buddy_relocate(): The ut_time_us() function is needed for
      statistics, calculating the total time spent on relocating blocks.
      Until now, we invoked ut_time_us() every time buf_buddy_relocate() was
      called. Fix: Only call ut_time_us() when the block can be relocated.
      After this fix, the reported relocated_usec will no longer include the
      time for the page_hash lookup and for acquiring the block mutex.
      
      Approved by Sunny Bains on IM

    modified:
      storage/innodb_plugin/ChangeLog
      storage/innodb_plugin/buf/buf0buddy.c
=== modified file 'scripts/mysql_install_db.sh'
--- a/scripts/mysql_install_db.sh	2011-06-30 15:37:13 +0000
+++ b/scripts/mysql_install_db.sh	2011-09-06 15:36:09 +0000
@@ -46,10 +46,16 @@ 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).