bzr push into mysql-trunk branch (nirbhay.choubey:3439 to 3440) Bug#11765888

[Nirbhay Choubey]

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

    modified:
      scripts/mysql_install_db.sh
 3439 Olav Sandstaa	2011-09-06
      Bug#12724899 - SELECT STRAIGHT_JOIN QUERY GIVES 2 DATES VERSUS
                     2 WARNINGS WITH ICP ON
      
      This bug is fixed by the fixes for bug 12601961 and bug 12822678.
      This patch contains the following changes:
      
      1. Enables the test case for bug 12601961 to run also for MyISAM.
      
      2. One of the two issues causing wrong results for MyISAM was that
      MyISAM did not evaluate index conditions when they were pushed on
      a table with "const" join type. This problem is fixed by the patch
      for bug 12822678 by no longer pushing index conditions for "const"
      tables. To detect if future server changes calls ha_index_read_idx_map()
      on MyISAM with a pushed index condition, two asserts are added to 
      ha_myisam::index_read_idx_map().
     @ mysql-test/include/icp_tests.inc
        Enable the test case for Bug 12822678 to be run also for MyISAM.
     @ mysql-test/r/innodb_icp.result
        Adding comment to test.
     @ mysql-test/r/innodb_icp_none.result
        Adding comment to test.
     @ mysql-test/r/myisam_icp.result
        Test case for Bug#12724899 SELECT STRAIGHT_JOIN QUERY GIVES 2 DATES VERSUS
        2 WARNINGS WITH ICP ON.
     @ mysql-test/r/myisam_icp_none.result
        Test case for Bug#12724899 SELECT STRAIGHT_JOIN QUERY GIVES 2 DATES VERSUS
        2 WARNINGS WITH ICP ON.
     @ storage/myisam/ha_myisam.cc
        Add asserts to ha_myisam::index_read_idx_map() to detect if it is called
        when an index condition has been pushed.

    modified:
      mysql-test/include/icp_tests.inc
      mysql-test/r/innodb_icp.result
      mysql-test/r/innodb_icp_none.result
      mysql-test/r/myisam_icp.result
      mysql-test/r/myisam_icp_none.result
      storage/myisam/ha_myisam.cc
=== modified file 'scripts/mysql_install_db.sh'
--- a/scripts/mysql_install_db.sh	2011-07-03 23:56:47 +0000
+++ b/scripts/mysql_install_db.sh	2011-09-06 15:42:17 +0000
@@ -45,10 +45,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).