bzr push into mysql-trunk branch (kevin.lewis:3482 to 3483)

[kevin.lewis]

 3483 kevin.lewis@stripped	2011-10-06
      WL5756 - Missed a result file with the last commit.

    modified:
      mysql-test/suite/opt_trace/r/range_ps_prot.result
 3482 kevin.lewis@stripped	2011-10-06
      WL5756 - Fix a number of testcases failing on certain platforms and page sizes.

    modified:
      mysql-test/r/index_merge_myisam.result
      mysql-test/suite/innodb/r/innodb_16k.result
      mysql-test/suite/innodb/r/innodb_4k.result
      mysql-test/suite/innodb/r/innodb_8k.result
      mysql-test/suite/innodb/t/innodb_16k.test
      mysql-test/suite/innodb/t/innodb_4k.test
      mysql-test/suite/innodb/t/innodb_8k.test
      mysql-test/suite/opt_trace/include/range.inc
      mysql-test/suite/opt_trace/r/range_no_prot.result
=== modified file 'mysql-test/suite/opt_trace/r/range_ps_prot.result'
--- a/mysql-test/suite/opt_trace/r/range_ps_prot.result	revid:kevin.lewis@stripped
+++ b/mysql-test/suite/opt_trace/r/range_ps_prot.result	revid:kevin.lewis@stripped
@@ -6452,7 +6452,7 @@ GROUP BY field1	{
                         ] /* ranges */,
                         "index_only": false,
                         "rows": 4,
-                        "cost": 1.8133,
+                        "cost": 1.####,
                         "rowid_ordered": true,
                         "chosen": true
                       },
@@ -6485,7 +6485,7 @@ GROUP BY field1	{
                       ] /* ranges */
                     } /* range_access_plan */,
                     "rows_for_plan": 4,
-                    "cost_for_plan": 1.8133,
+                    "cost_for_plan": 1.####,
                     "chosen": true
                   } /* chosen_range_access_summary */
                 } /* range_analysis */
@@ -6543,13 +6543,13 @@ GROUP BY field1	{
                     {
                       "access_type": "range",
                       "rows": 4,
-                      "cost": 1.8133,
+                      "cost": 1.####,
                       "chosen": true,
                       "use_tmp_table": true
                     }
                   ] /* considered_access_paths */
                 } /* best_access_path */,
-                "cost_for_plan": 2.6133,
+                "cost_for_plan": 2.####,
                 "rows_for_plan": 4,
                 "rest_of_plan": [
                   {
@@ -6565,10 +6565,10 @@ GROUP BY field1	{
                         }
                       ] /* considered_access_paths */
                     } /* best_access_path */,
-                    "cost_for_plan": 9.8133,
+                    "cost_for_plan": 9.####,
                     "rows_for_plan": 16,
                     "sort_cost": 16,
-                    "new_cost_for_plan": 25.813,
+                    "new_cost_for_plan": 25.###,
                     "chosen": true
                   }
                 ] /* rest_of_plan */
@@ -6597,15 +6597,15 @@ GROUP BY field1	{
                         {
                           "access_type": "range",
                           "rows": 4,
-                          "cost": 7.2532,
+                          "cost": 7.####,
                           "chosen": true
                         }
                       ] /* considered_access_paths */
                     } /* best_access_path */,
-                    "cost_for_plan": 12.253,
+                    "cost_for_plan": 12.###,
                     "rows_for_plan": 16,
                     "sort_cost": 16,
-                    "new_cost_for_plan": 28.253,
+                    "new_cost_for_plan": 28.###,
                     "chosen": false
                   }
                 ] /* rest_of_plan */

No bundle (reason: useless for push emails).