List:Commits« Previous MessageNext Message »
From:kevin.lewis Date:October 6 2011 5:48pm
Subject:bzr push into mysql-trunk branch (kevin.lewis:3481 to 3482)
View as plain text  
 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
 3481 kevin.lewis@stripped	2011-10-05
      WL5756-Forgot a file in previous patch.

    modified:
      mysql-test/include/index_merge_ror_cpk.inc
=== modified file 'mysql-test/r/index_merge_myisam.result'
--- a/mysql-test/r/index_merge_myisam.result	revid:kevin.lewis@stripped
+++ b/mysql-test/r/index_merge_myisam.result	revid:kevin.lewis@stripped
@@ -1492,19 +1492,19 @@ DROP TABLE t1,t2;
 #
 select @@optimizer_switch;
 @@optimizer_switch
-index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on,index_condition_pushdown=on,mrr=on,mrr_cost_based=on,block_nested_loop=on,batch_key_access=off
+index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on,index_condition_pushdown=on,mrr=on,mrr_cost_based=on,block_nested_loop=on,batched_key_access=off
 set optimizer_switch='index_merge=off,index_merge_union=off';
 select @@optimizer_switch;
 @@optimizer_switch
-index_merge=off,index_merge_union=off,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on,index_condition_pushdown=on,mrr=on,mrr_cost_based=on,block_nested_loop=on,batch_key_access=off
+index_merge=off,index_merge_union=off,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on,index_condition_pushdown=on,mrr=on,mrr_cost_based=on,block_nested_loop=on,batched_key_access=off
 set optimizer_switch='index_merge_union=on';
 select @@optimizer_switch;
 @@optimizer_switch
-index_merge=off,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on,index_condition_pushdown=on,mrr=on,mrr_cost_based=on,block_nested_loop=on,batch_key_access=off
+index_merge=off,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on,index_condition_pushdown=on,mrr=on,mrr_cost_based=on,block_nested_loop=on,batched_key_access=off
 set optimizer_switch='default,index_merge_sort_union=off';
 select @@optimizer_switch;
 @@optimizer_switch
-index_merge=on,index_merge_union=on,index_merge_sort_union=off,index_merge_intersection=on,engine_condition_pushdown=on,index_condition_pushdown=on,mrr=on,mrr_cost_based=on,block_nested_loop=on,batch_key_access=off
+index_merge=on,index_merge_union=on,index_merge_sort_union=off,index_merge_intersection=on,engine_condition_pushdown=on,index_condition_pushdown=on,mrr=on,mrr_cost_based=on,block_nested_loop=on,batched_key_access=off
 set optimizer_switch=4;
 set optimizer_switch=NULL;
 ERROR 42000: Variable 'optimizer_switch' can't be set to the value of 'NULL'
@@ -1530,21 +1530,21 @@ set optimizer_switch=default;
 set optimizer_switch='index_merge=off,index_merge_union=off,default';
 select @@optimizer_switch;
 @@optimizer_switch
-index_merge=off,index_merge_union=off,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on,index_condition_pushdown=on,mrr=on,mrr_cost_based=on,block_nested_loop=on,batch_key_access=off
+index_merge=off,index_merge_union=off,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on,index_condition_pushdown=on,mrr=on,mrr_cost_based=on,block_nested_loop=on,batched_key_access=off
 set optimizer_switch=default;
 select @@global.optimizer_switch;
 @@global.optimizer_switch
-index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on,index_condition_pushdown=on,mrr=on,mrr_cost_based=on,block_nested_loop=on,batch_key_access=off
+index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on,index_condition_pushdown=on,mrr=on,mrr_cost_based=on,block_nested_loop=on,batched_key_access=off
 set @@global.optimizer_switch=default;
 select @@global.optimizer_switch;
 @@global.optimizer_switch
-index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on,index_condition_pushdown=on,mrr=on,mrr_cost_based=on,block_nested_loop=on,batch_key_access=off
+index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on,index_condition_pushdown=on,mrr=on,mrr_cost_based=on,block_nested_loop=on,batched_key_access=off
 #
 # Check index_merge's @@optimizer_switch flags
 #
 select @@optimizer_switch;
 @@optimizer_switch
-index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on,index_condition_pushdown=on,mrr=on,mrr_cost_based=on,block_nested_loop=on,batch_key_access=off
+index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on,index_condition_pushdown=on,mrr=on,mrr_cost_based=on,block_nested_loop=on,batched_key_access=off
 create table t0 (a int);
 insert into t0 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
 create table t1 (a int, b int, c int, filler char(100), 
@@ -1654,5 +1654,5 @@ id	select_type	table	type	possible_keys	
 set optimizer_switch=default;
 show variables like 'optimizer_switch';
 Variable_name	Value
-optimizer_switch	index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on,index_condition_pushdown=on,mrr=on,mrr_cost_based=on,block_nested_loop=on,batch_key_access=off
+optimizer_switch	index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on,index_condition_pushdown=on,mrr=on,mrr_cost_based=on,block_nested_loop=on,batched_key_access=off
 drop table t0, t1;

=== modified file 'mysql-test/suite/innodb/r/innodb_16k.result'
--- a/mysql-test/suite/innodb/r/innodb_16k.result	revid:kevin.lewis@stripped
+++ b/mysql-test/suite/innodb/r/innodb_16k.result	revid:kevin.lewis@stripped
@@ -13,7 +13,6 @@ variable_value
 {checked_511_or_512}
 # Test 3) The root page numbers are dependent upon the page size.
 #         Pulled from innodb-system-table-view.test
-SELECT * FROM INFORMATION_SCHEMA.INNODB_SYS_INDEXES WHERE table_id NOT IN (13, 14);
 INDEX_ID	NAME	TABLE_ID	TYPE	N_FIELDS	PAGE_NO	SPACE
 11	ID_IND	11	3	1	302	0
 12	FOR_IND	11	0	1	303	0

=== modified file 'mysql-test/suite/innodb/r/innodb_4k.result'
--- a/mysql-test/suite/innodb/r/innodb_4k.result	revid:kevin.lewis@stripped
+++ b/mysql-test/suite/innodb/r/innodb_4k.result	revid:kevin.lewis@stripped
@@ -13,7 +13,6 @@ variable_value
 2048
 # Test 3) The root page numbers are dependent upon the page size.
 #         Pulled from innodb-system-table-view.test
-SELECT * FROM INFORMATION_SCHEMA.INNODB_SYS_INDEXES WHERE table_id NOT IN (13, 14);
 INDEX_ID	NAME	TABLE_ID	TYPE	N_FIELDS	PAGE_NO	SPACE
 11	ID_IND	11	3	1	801	0
 12	FOR_IND	11	0	1	802	0

=== modified file 'mysql-test/suite/innodb/r/innodb_8k.result'
--- a/mysql-test/suite/innodb/r/innodb_8k.result	revid:kevin.lewis@stripped
+++ b/mysql-test/suite/innodb/r/innodb_8k.result	revid:kevin.lewis@stripped
@@ -13,7 +13,6 @@ variable_value
 1024
 # Test 3) The root page numbers are dependent upon the page size.
 #         Pulled from innodb-system-table-view.test
-SELECT * FROM INFORMATION_SCHEMA.INNODB_SYS_INDEXES WHERE table_id NOT IN (13, 14);
 INDEX_ID	NAME	TABLE_ID	TYPE	N_FIELDS	PAGE_NO	SPACE
 11	ID_IND	11	3	1	466	0
 12	FOR_IND	11	0	1	467	0

=== modified file 'mysql-test/suite/innodb/t/innodb_16k.test'
--- a/mysql-test/suite/innodb/t/innodb_16k.test	revid:kevin.lewis@stripped
+++ b/mysql-test/suite/innodb/t/innodb_16k.test	revid:kevin.lewis@stripped
@@ -35,9 +35,11 @@ SELECT variable_value FROM information_s
 # use a freshly created database for this test then the following
 # complications can be removed and the test be reverted to the version
 # it was before the patch that adds this comment.
+--disable_query_log
 --let table_stats_id = `SELECT table_id FROM information_schema.innodb_sys_tables WHERE name = 'mysql/innodb_table_stats'`
 --let index_stats_id = `SELECT table_id FROM information_schema.innodb_sys_tables WHERE name = 'mysql/innodb_index_stats'`
 --eval SELECT * FROM INFORMATION_SCHEMA.INNODB_SYS_INDEXES WHERE table_id NOT IN ($table_stats_id, $index_stats_id)
+--enable_query_log
 
 --echo # Test 4) The maximum row size is dependent upon the page size.
 --echo #         Redundant: 8123, Compact: 8126.

=== modified file 'mysql-test/suite/innodb/t/innodb_4k.test'
--- a/mysql-test/suite/innodb/t/innodb_4k.test	revid:kevin.lewis@stripped
+++ b/mysql-test/suite/innodb/t/innodb_4k.test	revid:kevin.lewis@stripped
@@ -33,9 +33,11 @@ SELECT variable_value FROM information_s
 # use a freshly created database for this test then the following
 # complications can be removed and the test be reverted to the version
 # it was before the patch that adds this comment.
+--disable_query_log
 --let table_stats_id = `SELECT table_id FROM information_schema.innodb_sys_tables WHERE name = 'mysql/innodb_table_stats'`
 --let index_stats_id = `SELECT table_id FROM information_schema.innodb_sys_tables WHERE name = 'mysql/innodb_index_stats'`
 --eval SELECT * FROM INFORMATION_SCHEMA.INNODB_SYS_INDEXES WHERE table_id NOT IN ($table_stats_id, $index_stats_id)
+--enable_query_log
 
 --echo # Test 4) The maximum row size is dependent upon the page size.
 --echo #         Redundant: 1979, Compact: 1982.

=== modified file 'mysql-test/suite/innodb/t/innodb_8k.test'
--- a/mysql-test/suite/innodb/t/innodb_8k.test	revid:kevin.lewis@stripped
+++ b/mysql-test/suite/innodb/t/innodb_8k.test	revid:kevin.lewis@stripped
@@ -33,9 +33,11 @@ SELECT variable_value FROM information_s
 # use a freshly created database for this test then the following
 # complications can be removed and the test be reverted to the version
 # it was before the patch that adds this comment.
+--disable_query_log
 --let table_stats_id = `SELECT table_id FROM information_schema.innodb_sys_tables WHERE name = 'mysql/innodb_table_stats'`
 --let index_stats_id = `SELECT table_id FROM information_schema.innodb_sys_tables WHERE name = 'mysql/innodb_index_stats'`
 --eval SELECT * FROM INFORMATION_SCHEMA.INNODB_SYS_INDEXES WHERE table_id NOT IN ($table_stats_id, $index_stats_id)
+--enable_query_log
 
 --echo # Test 4) The maximum row size is dependent upon the page size.
 --echo #         Redundant: 4027, Compact: 4030.

=== 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
@@ -336,6 +336,8 @@ 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 .### 
 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
@@ -6462,7 +6462,7 @@ GROUP BY field1	{
                         ] /* ranges */,
                         "index_only": false,
                         "rows": 4,
-                        "cost": 1.8133,
+                        "cost": 1.####,
                         "rowid_ordered": true,
                         "chosen": true
                       },
@@ -6495,7 +6495,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 */
@@ -6553,13 +6553,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": [
                   {
@@ -6575,10 +6575,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 */
@@ -6607,15 +6607,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).
Thread
bzr push into mysql-trunk branch (kevin.lewis:3481 to 3482) kevin.lewis11 Oct