bzr push into mysql-5.5 branch (nirbhay.choubey:3521 to 3522) Bug#11765888

[Nirbhay Choubey]

 3522 Nirbhay Choubey	2011-09-06 [merge]
      Local merge of patch for bug#11765888 from mysql-5.1.

    modified:
      scripts/mysql_install_db.sh
 3521 Marko Mäkelä	2011-09-06
      Bug#11766305 - 59392: Remove thr0loc.c and ibuf_inside() - cleanup
      
      Remove the unused debug constants for the latching order level SYNC_THR_LOCAL.

    modified:
      storage/innobase/include/sync0sync.h
      storage/innobase/sync/sync0sync.c
=== modified file 'scripts/mysql_install_db.sh'
--- a/scripts/mysql_install_db.sh	2011-06-30 15:46:53 +0000
+++ b/scripts/mysql_install_db.sh	2011-09-06 15:39:35 +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).