List:Commits« Previous MessageNext Message »
From:kevin.lewis Date:October 6 2011 10:42pm
Subject:bzr push into mysql-trunk branch (kevin.lewis:3483 to 3484)
View as plain text  
 3484 kevin.lewis@stripped	2011-10-06
      WL5756 - gleb requested to use --replace_regex instead of --replace_result in range.inc

    modified:
      mysql-test/suite/opt_trace/include/range.inc
      mysql-test/suite/opt_trace/r/range_no_prot.result
      mysql-test/suite/opt_trace/r/range_ps_prot.result
 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
=== modified file 'mysql-test/suite/opt_trace/include/range.inc'
--- a/mysql-test/suite/opt_trace/include/range.inc	revid:kevin.lewis@stripped
+++ b/mysql-test/suite/opt_trace/include/range.inc	revid:kevin.lewis@stripped
@@ -337,7 +337,7 @@ SET optimizer_switch="block_nested_loop=
 eval EXPLAIN $query;
 
 # The cost numbers can vary slightly depending on innodb-page-size
---replace_result .8133 .#### .8166 .#### .8232 .#### .6133 .#### .6166 .#### .6232 .#### .813 .### .817 .### .823 .### .2532 .#### .2664 .#### .2928 .#### .253 .### .266 .### .293 .### 
+--replace_regex /("cost"|"new_cost_for_plan"|"cost_for_plan"): [0-9]+\.[0-9]+/\1: ##.###/ 
 SELECT * FROM information_schema.OPTIMIZER_TRACE;
 SET @@optimizer_switch=@old_opt_switch;
 DROP TABLE t1,t2;

=== modified file 'mysql-test/suite/opt_trace/r/range_no_prot.result'
--- a/mysql-test/suite/opt_trace/r/range_no_prot.result	revid:kevin.lewis@stripped
+++ b/mysql-test/suite/opt_trace/r/range_no_prot.result	revid:kevin.lewis@stripped
@@ -6424,7 +6424,7 @@ GROUP BY field1	{
                 "range_analysis": {
                   "table_scan": {
                     "rows": 6,
-                    "cost": 4.3
+                    "cost": ##.###
                   } /* table_scan */,
                   "potential_range_indices": [
                     {
@@ -6444,7 +6444,7 @@ GROUP BY field1	{
                   ] /* potential_range_indices */,
                   "best_covering_index_scan": {
                     "index": "col_int_key",
-                    "cost": 2.2055,
+                    "cost": ##.###,
                     "chosen": true
                   } /* best_covering_index_scan */,
                   "setup_range_conditions": [
@@ -6462,7 +6462,7 @@ GROUP BY field1	{
                         ] /* ranges */,
                         "index_only": false,
                         "rows": 4,
-                        "cost": 1.####,
+                        "cost": ##.###,
                         "rowid_ordered": true,
                         "chosen": true
                       },
@@ -6474,7 +6474,7 @@ GROUP BY field1	{
                         ] /* ranges */,
                         "index_only": true,
                         "rows": 5,
-                        "cost": 2.0144,
+                        "cost": ##.###,
                         "rowid_ordered": false,
                         "chosen": false,
                         "cause": "cost"
@@ -6495,7 +6495,7 @@ GROUP BY field1	{
                       ] /* ranges */
                     } /* range_access_plan */,
                     "rows_for_plan": 4,
-                    "cost_for_plan": 1.####,
+                    "cost_for_plan": ##.###,
                     "chosen": true
                   } /* chosen_range_access_summary */
                 } /* range_analysis */
@@ -6512,7 +6512,7 @@ GROUP BY field1	{
                 "range_analysis": {
                   "table_scan": {
                     "rows": 4,
-                    "cost": 3.9
+                    "cost": ##.###
                   } /* table_scan */,
                   "potential_range_indices": [
                     {
@@ -6530,7 +6530,7 @@ GROUP BY field1	{
                   ] /* potential_range_indices */,
                   "best_covering_index_scan": {
                     "index": "col_int_key",
-                    "cost": 1.8033,
+                    "cost": ##.###,
                     "chosen": true
                   } /* best_covering_index_scan */,
                   "setup_range_conditions": [
@@ -6553,13 +6553,13 @@ GROUP BY field1	{
                     {
                       "access_type": "range",
                       "rows": 4,
-                      "cost": 1.####,
+                      "cost": ##.###,
                       "chosen": true,
                       "use_tmp_table": true
                     }
                   ] /* considered_access_paths */
                 } /* best_access_path */,
-                "cost_for_plan": 2.####,
+                "cost_for_plan": ##.###,
                 "rows_for_plan": 4,
                 "rest_of_plan": [
                   {
@@ -6575,10 +6575,10 @@ GROUP BY field1	{
                         }
                       ] /* considered_access_paths */
                     } /* best_access_path */,
-                    "cost_for_plan": 9.####,
+                    "cost_for_plan": ##.###,
                     "rows_for_plan": 16,
                     "sort_cost": 16,
-                    "new_cost_for_plan": 25.###,
+                    "new_cost_for_plan": ##.###,
                     "chosen": true
                   }
                 ] /* rest_of_plan */
@@ -6596,7 +6596,7 @@ GROUP BY field1	{
                     }
                   ] /* considered_access_paths */
                 } /* best_access_path */,
-                "cost_for_plan": 1.8,
+                "cost_for_plan": ##.###,
                 "rows_for_plan": 4,
                 "rest_of_plan": [
                   {
@@ -6607,15 +6607,15 @@ GROUP BY field1	{
                         {
                           "access_type": "range",
                           "rows": 4,
-                          "cost": 7.####,
+                          "cost": ##.###,
                           "chosen": true
                         }
                       ] /* considered_access_paths */
                     } /* best_access_path */,
-                    "cost_for_plan": 12.###,
+                    "cost_for_plan": ##.###,
                     "rows_for_plan": 16,
                     "sort_cost": 16,
-                    "new_cost_for_plan": 28.###,
+                    "new_cost_for_plan": ##.###,
                     "chosen": false
                   }
                 ] /* rest_of_plan */
@@ -6679,7 +6679,7 @@ GROUP BY field1	{
                 "range_analysis": {
                   "table_scan": {
                     "rows": 6,
-                    "cost": 4.3
+                    "cost": ##.###
                   } /* table_scan */,
                   "potential_range_indices": [
                     {
@@ -6697,7 +6697,7 @@ GROUP BY field1	{
                   ] /* potential_range_indices */,
                   "best_covering_index_scan": {
                     "index": "col_int_key",
-                    "cost": 2.2055,
+                    "cost": ##.###,
                     "chosen": true
                   } /* best_covering_index_scan */,
                   "setup_range_conditions": [
@@ -6716,7 +6716,7 @@ GROUP BY field1	{
                         ] /* ranges */,
                         "index_only": true,
                         "rows": 5,
-                        "cost": 2.0144,
+                        "cost": ##.###,
                         "rowid_ordered": false,
                         "chosen": true
                       }
@@ -6737,7 +6737,7 @@ GROUP BY field1	{
                       ] /* ranges */
                     } /* range_access_plan */,
                     "rows_for_plan": 5,
-                    "cost_for_plan": 2.0144,
+                    "cost_for_plan": ##.###,
                     "chosen": true
                   } /* chosen_range_access_summary */
                 } /* range_analysis */

=== 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
@@ -6414,7 +6414,7 @@ GROUP BY field1	{
                 "range_analysis": {
                   "table_scan": {
                     "rows": 6,
-                    "cost": 4.3
+                    "cost": ##.###
                   } /* table_scan */,
                   "potential_range_indices": [
                     {
@@ -6434,7 +6434,7 @@ GROUP BY field1	{
                   ] /* potential_range_indices */,
                   "best_covering_index_scan": {
                     "index": "col_int_key",
-                    "cost": 2.2055,
+                    "cost": ##.###,
                     "chosen": true
                   } /* best_covering_index_scan */,
                   "setup_range_conditions": [
@@ -6452,7 +6452,7 @@ GROUP BY field1	{
                         ] /* ranges */,
                         "index_only": false,
                         "rows": 4,
-                        "cost": 1.####,
+                        "cost": ##.###,
                         "rowid_ordered": true,
                         "chosen": true
                       },
@@ -6464,7 +6464,7 @@ GROUP BY field1	{
                         ] /* ranges */,
                         "index_only": true,
                         "rows": 5,
-                        "cost": 2.0144,
+                        "cost": ##.###,
                         "rowid_ordered": false,
                         "chosen": false,
                         "cause": "cost"
@@ -6485,7 +6485,7 @@ GROUP BY field1	{
                       ] /* ranges */
                     } /* range_access_plan */,
                     "rows_for_plan": 4,
-                    "cost_for_plan": 1.####,
+                    "cost_for_plan": ##.###,
                     "chosen": true
                   } /* chosen_range_access_summary */
                 } /* range_analysis */
@@ -6502,7 +6502,7 @@ GROUP BY field1	{
                 "range_analysis": {
                   "table_scan": {
                     "rows": 4,
-                    "cost": 3.9
+                    "cost": ##.###
                   } /* table_scan */,
                   "potential_range_indices": [
                     {
@@ -6520,7 +6520,7 @@ GROUP BY field1	{
                   ] /* potential_range_indices */,
                   "best_covering_index_scan": {
                     "index": "col_int_key",
-                    "cost": 1.8033,
+                    "cost": ##.###,
                     "chosen": true
                   } /* best_covering_index_scan */,
                   "setup_range_conditions": [
@@ -6543,13 +6543,13 @@ GROUP BY field1	{
                     {
                       "access_type": "range",
                       "rows": 4,
-                      "cost": 1.####,
+                      "cost": ##.###,
                       "chosen": true,
                       "use_tmp_table": true
                     }
                   ] /* considered_access_paths */
                 } /* best_access_path */,
-                "cost_for_plan": 2.####,
+                "cost_for_plan": ##.###,
                 "rows_for_plan": 4,
                 "rest_of_plan": [
                   {
@@ -6565,10 +6565,10 @@ GROUP BY field1	{
                         }
                       ] /* considered_access_paths */
                     } /* best_access_path */,
-                    "cost_for_plan": 9.####,
+                    "cost_for_plan": ##.###,
                     "rows_for_plan": 16,
                     "sort_cost": 16,
-                    "new_cost_for_plan": 25.###,
+                    "new_cost_for_plan": ##.###,
                     "chosen": true
                   }
                 ] /* rest_of_plan */
@@ -6586,7 +6586,7 @@ GROUP BY field1	{
                     }
                   ] /* considered_access_paths */
                 } /* best_access_path */,
-                "cost_for_plan": 1.8,
+                "cost_for_plan": ##.###,
                 "rows_for_plan": 4,
                 "rest_of_plan": [
                   {
@@ -6597,15 +6597,15 @@ GROUP BY field1	{
                         {
                           "access_type": "range",
                           "rows": 4,
-                          "cost": 7.####,
+                          "cost": ##.###,
                           "chosen": true
                         }
                       ] /* considered_access_paths */
                     } /* best_access_path */,
-                    "cost_for_plan": 12.###,
+                    "cost_for_plan": ##.###,
                     "rows_for_plan": 16,
                     "sort_cost": 16,
-                    "new_cost_for_plan": 28.###,
+                    "new_cost_for_plan": ##.###,
                     "chosen": false
                   }
                 ] /* rest_of_plan */
@@ -6669,7 +6669,7 @@ GROUP BY field1	{
                 "range_analysis": {
                   "table_scan": {
                     "rows": 6,
-                    "cost": 4.3
+                    "cost": ##.###
                   } /* table_scan */,
                   "potential_range_indices": [
                     {
@@ -6687,7 +6687,7 @@ GROUP BY field1	{
                   ] /* potential_range_indices */,
                   "best_covering_index_scan": {
                     "index": "col_int_key",
-                    "cost": 2.2055,
+                    "cost": ##.###,
                     "chosen": true
                   } /* best_covering_index_scan */,
                   "setup_range_conditions": [
@@ -6706,7 +6706,7 @@ GROUP BY field1	{
                         ] /* ranges */,
                         "index_only": true,
                         "rows": 5,
-                        "cost": 2.0144,
+                        "cost": ##.###,
                         "rowid_ordered": false,
                         "chosen": true
                       }
@@ -6727,7 +6727,7 @@ GROUP BY field1	{
                       ] /* ranges */
                     } /* range_access_plan */,
                     "rows_for_plan": 5,
-                    "cost_for_plan": 2.0144,
+                    "cost_for_plan": ##.###,
                     "chosen": true
                   } /* chosen_range_access_summary */
                 } /* range_analysis */

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk branch (kevin.lewis:3483 to 3484) kevin.lewis11 Oct