3480 kevin.lewis@stripped 2011-10-05
WL5756-Remove 'loose-' before 'innodb-page-size' in 2 more lines.
modified:
mysql-test/collections/default.push
3479 kevin.lewis@stripped 2011-10-05
WL5756 - Cleaned up a few more suite=main test cases to make them work with 4k and 8k page sizes.
modified:
mysql-test/include/index_merge_ror_cpk.inc
mysql-test/r/index_merge_innodb.result
mysql-test/r/index_merge_myisam.result
mysql-test/suite/sys_vars/inc/delayed_queue_size_basic.inc
mysql-test/suite/sys_vars/r/innodb_page_size_basic.result
mysql-test/suite/sys_vars/t/delayed_insert_timeout_basic.test
mysql-test/suite/sys_vars/t/innodb_buffer_pool_load_at_startup_basic.test
mysql-test/suite/sys_vars/t/innodb_page_size_basic.test
mysql-test/t/mysqlbinlog_row_innodb.test
3478 kevin.lewis@stripped 2011-10-05
WL5756 - Changes to main test suite and default.push to make PB2 greener.
modified:
extra/innochecksum.c
mysql-test/collections/default.push
mysql-test/include/index_merge_ror_cpk.inc
mysql-test/include/mrr_tests.inc
mysql-test/r/index_merge_innodb.result
mysql-test/r/index_merge_myisam.result
mysql-test/r/innodb_mrr.result
mysql-test/r/innodb_mrr_cost.result
mysql-test/r/innodb_mrr_cost_icp.result
mysql-test/r/innodb_mrr_icp.result
mysql-test/r/innodb_mrr_none.result
mysql-test/r/partition_innodb.result
mysql-test/t/partition_innodb.test
=== modified file 'mysql-test/collections/default.push'
--- a/mysql-test/collections/default.push revid:kevin.lewis@stripped
+++ b/mysql-test/collections/default.push revid:kevin.lewis@stripped
@@ -10,6 +10,6 @@ perl mysql-test-run.pl --timer --force -
perl mysql-test-run.pl --timer --force --parallel=auto --comment=main_ps_row_8k_size --vardir=var-main-ps_row --suite=main --ps-protocol --mysqld=--binlog-format=row --experimental=collections/default.experimental --skip-ndb --skip-test-list=collections/disabled-per-push.list --mysqld=--innodb-page-size=8k --skip-test=innodb_ignore_builtin
perl mysql-test-run.pl --timer --force --parallel=auto --comment=main_embedded_8k_size --vardir=var-main_emebbed --suite=main --embedded --experimental=collections/default.experimental --skip-ndb --mysqld=--innodb-page-size=8k --skip-test=innodb_ignore_builtin
# Run InnoDB with 4k page size
-perl mysql-test-run.pl --timer --force --parallel=auto --comment=innodb_4k_size --vardir=var-innodb-4k --suite=innodb --experimental=collections/default.experimental --skip-ndb --mysqld=--loose-innodb-page-size=4k
+perl mysql-test-run.pl --timer --force --parallel=auto --comment=innodb_4k_size --vardir=var-innodb-4k --suite=innodb --experimental=collections/default.experimental --skip-ndb --mysqld=--innodb-page-size=4k
# Run InnoDB with 8k page size
-perl mysql-test-run.pl --timer --force --parallel=auto --comment=innodb_8k_size --vardir=var-innodb-8k --suite=innodb --experimental=collections/default.experimental --skip-ndb --mysqld=--loose-innodb-page-size=8k
+perl mysql-test-run.pl --timer --force --parallel=auto --comment=innodb_8k_size --vardir=var-innodb-8k --suite=innodb --experimental=collections/default.experimental --skip-ndb --mysqld=--innodb-page-size=8k
=== modified file 'mysql-test/include/index_merge_ror_cpk.inc'
--- a/mysql-test/include/index_merge_ror_cpk.inc revid:kevin.lewis@stripped
+++ b/mysql-test/include/index_merge_ror_cpk.inc revid:kevin.lewis@stripped
@@ -81,7 +81,10 @@ select pk1,pk2 from t1 where key1 = 10 a
# Verify that CPK is always used for index intersection scans
# (this is because it is used as a filter, not for retrieval)
+# The expected number of rows can vary depending on page size
+--replace_column 9 ROWS
explain select * from t1 where badkey=1 and key1=10;
+# The expected number of rows can vary depending on page size
--replace_column 9 ROWS
explain select * from t1 where pk1 < 7500 and key1 = 10;
@@ -91,14 +94,20 @@ explain select * from t1 where pktail2ok
# Note: The following is actually a deficiency, it uses sort_union currently.
# This comment refers to InnoDB and is probably not valid for other engines.
+# The expected number of rows can vary depending on page size
+--replace_column 9 ROWS
explain select * from t1 where (pktail2ok=1 and pk1< 50000) or key1=10;
-# The expected rows differs a bit from platform to platform
---replace_result 98 ROWS 99 ROWS 100 ROWS
# The expected column used for KEY vary depending on page size
--replace_column 6 EITHER_KEY
+# The expected number of rows can vary depending on page size and platform
+--replace_column 9 ROWS
explain select * from t1 where pktail3bad=1 and key1=10;
+# The expected column used for KEY vary depending on page size
+--replace_column 9 ROWS
explain select * from t1 where pktail4bad=1 and key1=10;
+# The expected column used for KEY vary depending on page size
+--replace_column 9 ROWS
explain select * from t1 where pktail5bad=1 and key1=10;
# Test for problem with innodb key values prefetch buffer:
=== modified file 'mysql-test/r/index_merge_innodb.result'
--- a/mysql-test/r/index_merge_innodb.result revid:kevin.lewis@stripped
+++ b/mysql-test/r/index_merge_innodb.result revid:kevin.lewis@stripped
@@ -196,7 +196,7 @@ pk1 pk2
95 59
explain select * from t1 where badkey=1 and key1=10;
id select_type table type possible_keys key key_len ref rows Extra
-1 SIMPLE t1 ref key1 key1 4 const 100 Using where
+1 SIMPLE t1 ref key1 key1 4 const ROWS Using where
explain select * from t1 where pk1 < 7500 and key1 = 10;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t1 index_merge PRIMARY,key1 key1,PRIMARY 4,4 NULL ROWS Using intersect(key1,PRIMARY); Using where
@@ -208,16 +208,16 @@ id select_type table type possible_keys
1 SIMPLE t1 index_merge key1,pktail2ok key1,pktail2ok 4,4 NULL 1 Using intersect(key1,pktail2ok); Using where
explain select * from t1 where (pktail2ok=1 and pk1< 50000) or key1=10;
id select_type table type possible_keys key key_len ref rows Extra
-1 SIMPLE t1 index_merge PRIMARY,key1,pktail2ok pktail2ok,key1 8,4 NULL 199 Using sort_union(pktail2ok,key1); Using where
+1 SIMPLE t1 index_merge PRIMARY,key1,pktail2ok pktail2ok,key1 8,4 NULL ROWS Using sort_union(pktail2ok,key1); Using where
explain select * from t1 where pktail3bad=1 and key1=10;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t1 ref key1,pktail3bad EITHER_KEY 4 const ROWS Using where
explain select * from t1 where pktail4bad=1 and key1=10;
id select_type table type possible_keys key key_len ref rows Extra
-1 SIMPLE t1 ref key1,pktail4bad key1 4 const 100 Using where
+1 SIMPLE t1 ref key1,pktail4bad key1 4 const ROWS Using where
explain select * from t1 where pktail5bad=1 and key1=10;
id select_type table type possible_keys key key_len ref rows Extra
-1 SIMPLE t1 ref key1,pktail5bad key1 4 const 100 Using where
+1 SIMPLE t1 ref key1,pktail5bad key1 4 const ROWS Using where
explain select pk1,pk2,key1,key2 from t1 where key1 = 10 and key2=10 limit 10;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t1 index_merge key1,key2 key1,key2 4,4 NULL 1 Using intersect(key1,key2); Using where; Using index
=== 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
@@ -1409,7 +1409,7 @@ pk1 pk2
95 50
explain select * from t1 where badkey=1 and key1=10;
id select_type table type possible_keys key key_len ref rows Extra
-1 SIMPLE t1 ref key1 key1 4 const 91 Using where
+1 SIMPLE t1 ref key1 key1 4 const ROWS Using where
explain select * from t1 where pk1 < 7500 and key1 = 10;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t1 ref PRIMARY,key1 key1 4 const ROWS Using where
@@ -1421,16 +1421,16 @@ id select_type table type possible_keys
1 SIMPLE t1 ref key1,pktail2ok pktail2ok 4 const 82 Using where
explain select * from t1 where (pktail2ok=1 and pk1< 50000) or key1=10;
id select_type table type possible_keys key key_len ref rows Extra
-1 SIMPLE t1 index_merge PRIMARY,key1,pktail2ok pktail2ok,key1 8,4 NULL 173 Using sort_union(pktail2ok,key1); Using where
+1 SIMPLE t1 index_merge PRIMARY,key1,pktail2ok pktail2ok,key1 8,4 NULL ROWS Using sort_union(pktail2ok,key1); Using where
explain select * from t1 where pktail3bad=1 and key1=10;
id select_type table type possible_keys key key_len ref rows Extra
-1 SIMPLE t1 ref key1,pktail3bad EITHER_KEY 4 const 73 Using where
+1 SIMPLE t1 ref key1,pktail3bad EITHER_KEY 4 const ROWS Using where
explain select * from t1 where pktail4bad=1 and key1=10;
id select_type table type possible_keys key key_len ref rows Extra
-1 SIMPLE t1 ref key1,pktail4bad pktail4bad 4 const 82 Using where
+1 SIMPLE t1 ref key1,pktail4bad pktail4bad 4 const ROWS Using where
explain select * from t1 where pktail5bad=1 and key1=10;
id select_type table type possible_keys key key_len ref rows Extra
-1 SIMPLE t1 ref key1,pktail5bad pktail5bad 4 const 70 Using where
+1 SIMPLE t1 ref key1,pktail5bad pktail5bad 4 const ROWS Using where
explain select pk1,pk2,key1,key2 from t1 where key1 = 10 and key2=10 limit 10;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t1 index_merge key1,key2 key1,key2 4,4 NULL 1 Using intersect(key1,key2); Using where
@@ -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,batched_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,batch_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,batched_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,batch_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,batched_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,batch_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,batched_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,batch_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,batched_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,batch_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,batched_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,batch_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,batched_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,batch_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,batched_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,batch_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,batched_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,batch_key_access=off
drop table t0, t1;
=== modified file 'mysql-test/suite/sys_vars/inc/delayed_queue_size_basic.inc'
--- a/mysql-test/suite/sys_vars/inc/delayed_queue_size_basic.inc revid:kevin.lewis@stripped
+++ b/mysql-test/suite/sys_vars/inc/delayed_queue_size_basic.inc revid:kevin.lewis@stripped
@@ -90,9 +90,9 @@ SELECT @@delayed_queue_size;
# Test if accessing session delayed_queue_size gives error #
############################################################################
---Error 1229
+--Error ER_GLOBAL_VARIABLE
SET @@session.delayed_queue_size = 0;
---Error 1238
+--Error ER_INCORRECT_GLOBAL_LOCAL_VAR
SELECT @@session.delayed_queue_size;
--echo '#----------------------FN_DYNVARS_026_06------------------------#'
@@ -133,7 +133,7 @@ SELECT @@delayed_queue_size = @@global.d
# Check if delayed_queue_size can be accessed with and without @@ sign #
###########################################################################
---Error 1229
+--Error ER_GLOBAL_VARIABLE
SET delayed_queue_size = 1;
SELECT @@delayed_queue_size;
--Error ER_PARSE_ERROR
=== modified file 'mysql-test/suite/sys_vars/r/innodb_page_size_basic.result'
--- a/mysql-test/suite/sys_vars/r/innodb_page_size_basic.result revid:kevin.lewis@stripped
+++ b/mysql-test/suite/sys_vars/r/innodb_page_size_basic.result revid:kevin.lewis@stripped
@@ -1,7 +1,7 @@
SET @orig = @@global.innodb_page_size;
SELECT @orig;
@orig
-16384
+{valid_page_size}
SET GLOBAL innodb_page_size = 4k;
ERROR HY000: Variable 'innodb_page_size' is a read only variable
SET GLOBAL innodb_page_size = 8k;
=== modified file 'mysql-test/suite/sys_vars/t/delayed_insert_timeout_basic.test'
--- a/mysql-test/suite/sys_vars/t/delayed_insert_timeout_basic.test revid:kevin.lewis@stripped
+++ b/mysql-test/suite/sys_vars/t/delayed_insert_timeout_basic.test revid:kevin.lewis@stripped
@@ -93,9 +93,9 @@ SELECT @@global.delayed_insert_timeout;
# Test if accessing session delayed_insert_timeout gives error #
#################################################################################
---Error 1229
+--Error ER_GLOBAL_VARIABLE
SET @@session.delayed_insert_timeout = 0;
---Error 1193
+--Error ER_UNKNOWN_SYSTEM_VARIABLE
SELECT @@session.dalayed_insert_timeout;
--echo '#----------------------FN_DYNVARS_025_06------------------------#'
@@ -137,18 +137,18 @@ SELECT @@delayed_insert_timeout = @@glob
# Check if delayed_insert_timeout can be accessed with and without @@ sign #
################################################################################
---Error 1229
+--Error ER_GLOBAL_VARIABLE
SET delayed_insert_timeout = 1;
SELECT @@delayed_insert_timeout;
---Error 1064
+--Error ER_PARSE_ERROR
SET local.delayed_insert_timeout = 1;
---Error 1109
+--Error ER_UNKNOWN_TABLE
SELECT local.delayed_insert_timeout;
---Error 1064
+--Error ER_PARSE_ERROR
SET global.delayed_insert_timeout = 1;
---Error 1109
+--Error ER_UNKNOWN_TABLE
SELECT global.delayed_insert_timeout;
---Error 1054
+--Error ER_BAD_FIELD_ERROR
SELECT delayed_insert_timeout = @@session.delayed_insert_timeout;
# Restore initial value
SET @@global.delayed_insert_timeout = @start_value;
=== modified file 'mysql-test/suite/sys_vars/t/innodb_buffer_pool_load_at_startup_basic.test'
--- a/mysql-test/suite/sys_vars/t/innodb_buffer_pool_load_at_startup_basic.test revid:kevin.lewis@stripped
+++ b/mysql-test/suite/sys_vars/t/innodb_buffer_pool_load_at_startup_basic.test revid:kevin.lewis@stripped
@@ -9,7 +9,7 @@ SET @orig = @@global.innodb_buffer_pool_
SELECT @orig;
# Confirm that we can not change the value
--- error 1238
+-- error ER_INCORRECT_GLOBAL_LOCAL_VAR
SET GLOBAL innodb_buffer_pool_load_at_startup = OFF;
--- error 1238
+-- error ER_INCORRECT_GLOBAL_LOCAL_VAR
SET GLOBAL innodb_buffer_pool_load_at_startup = ON;
=== modified file 'mysql-test/suite/sys_vars/t/innodb_page_size_basic.test'
--- a/mysql-test/suite/sys_vars/t/innodb_page_size_basic.test revid:kevin.lewis@stripped
+++ b/mysql-test/suite/sys_vars/t/innodb_page_size_basic.test revid:kevin.lewis@stripped
@@ -6,6 +6,7 @@
# Check the default value
SET @orig = @@global.innodb_page_size;
+--replace_result 16384 {valid_page_size} 8192 {valid_page_size} 4096 {valid_page_size}
SELECT @orig;
# Confirm that we can not change the value
=== modified file 'mysql-test/t/mysqlbinlog_row_innodb.test'
--- a/mysql-test/t/mysqlbinlog_row_innodb.test revid:kevin.lewis@stripped
+++ b/mysql-test/t/mysqlbinlog_row_innodb.test revid:kevin.lewis@stripped
@@ -10,6 +10,7 @@
#
--source include/have_innodb.inc
+--source include/have_innodb_16k.inc
let $engine_type=InnoDB;
#
No bundle (reason: useless for push emails).
| Thread |
|---|
| • bzr push into mysql-trunk branch (kevin.lewis:3478 to 3480) | kevin.lewis | 11 Oct |
