From: Tor Didriksen Date: November 5 2010 8:30am Subject: bzr commit into mysql-next-mr-bugfixing branch (tor.didriksen:3275) List-Archive: http://lists.mysql.com/commits/122897 Message-Id: <20101105083037.606FC35BB@atum07.norway.sun.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============8346037403669853572==" --===============8346037403669853572== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #At file:///export/home/didrik/repo/next-mr-opt-backporting/ based on revid:tor.didriksen@stripped 3275 Tor Didriksen 2010-11-05 Post-merge fix: update result files. modified: mysql-test/r/index_merge_innodb.result mysql-test/r/innodb_icp.result mysql-test/r/innodb_icp_all.result mysql-test/r/innodb_mrr.result mysql-test/r/innodb_mrr_all.result mysql-test/r/innodb_mrr_icp.result mysql-test/r/innodb_mrr_none.result mysql-test/r/select_all.result mysql-test/r/select_all_jcl6.result mysql-test/r/select_icp_mrr.result mysql-test/r/select_icp_mrr_jcl6.result mysql-test/r/select_none_jcl6.result mysql-test/suite/innodb/r/innodb.result mysql-test/suite/innodb/r/innodb_lock_wait_timeout_1.result mysql-test/t/innodb_icp.test mysql-test/t/innodb_icp_all.test mysql-test/t/innodb_mrr.test mysql-test/t/innodb_mrr_all.test mysql-test/t/innodb_mrr_icp.test === modified file 'mysql-test/r/index_merge_innodb.result' --- a/mysql-test/r/index_merge_innodb.result 2010-10-26 09:10:59 +0000 +++ b/mysql-test/r/index_merge_innodb.result 2010-11-05 08:30:31 +0000 @@ -166,7 +166,7 @@ primary key (pk1, pk2) ); explain select * from t1 where pk1 = 1 and pk2 < 80 and key1=0; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 range PRIMARY,key1 PRIMARY 8 NULL 9 Using where +1 SIMPLE t1 range PRIMARY,key1 PRIMARY 8 NULL 9 Using index condition; Using where select * from t1 where pk1 = 1 and pk2 < 80 and key1=0; pk1 pk2 key1 key2 pktail1ok pktail2ok pktail3bad pktail4bad pktail5bad pk2copy badkey filler1 filler2 1 10 0 0 0 0 0 0 0 10 0 filler-data-10 filler2 === modified file 'mysql-test/r/innodb_icp.result' --- a/mysql-test/r/innodb_icp.result 2010-11-02 18:47:47 +0000 +++ b/mysql-test/r/innodb_icp.result 2010-11-05 08:30:31 +0000 @@ -1,6 +1,6 @@ set optimizer_switch='index_condition_pushdown=on'; -set @save_storage_engine= @@storage_engine; -set storage_engine=InnoDB; +set @save_storage_engine= @@default_storage_engine; +set default_storage_engine=InnoDB; # # Bug#36981 - "innodb crash when selecting for update" # @@ -349,7 +349,7 @@ WHERE ts BETWEEN '0000-00-00' AND '2010- ORDER BY ts DESC LIMIT 2; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 range PRIMARY PRIMARY 4 NULL 4 Using where +1 SIMPLE t1 range PRIMARY PRIMARY 4 NULL 4 Using index condition DROP TABLE t1; # @@ -453,5 +453,5 @@ LIMIT 1; id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t1 range PRIMARY,k1 k1 5 NULL 3 Using where; Using index DROP TABLE t1; -set storage_engine= @save_storage_engine; +set default_storage_engine= @save_storage_engine; set optimizer_switch=default; === modified file 'mysql-test/r/innodb_icp_all.result' --- a/mysql-test/r/innodb_icp_all.result 2010-11-02 18:47:47 +0000 +++ b/mysql-test/r/innodb_icp_all.result 2010-11-05 08:30:31 +0000 @@ -1,6 +1,6 @@ set optimizer_switch='semijoin=on,materialization=on,firstmatch=on,loosescan=on,index_condition_pushdown=on,mrr=on'; -set @save_storage_engine= @@storage_engine; -set storage_engine=InnoDB; +set @save_storage_engine= @@default_storage_engine; +set default_storage_engine=InnoDB; # # Bug#36981 - "innodb crash when selecting for update" # @@ -349,7 +349,7 @@ WHERE ts BETWEEN '0000-00-00' AND '2010- ORDER BY ts DESC LIMIT 2; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 range PRIMARY PRIMARY 4 NULL 4 Using where +1 SIMPLE t1 range PRIMARY PRIMARY 4 NULL 4 Using index condition DROP TABLE t1; # @@ -453,5 +453,5 @@ LIMIT 1; id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t1 range PRIMARY,k1 k1 5 NULL 3 Using where; Using index DROP TABLE t1; -set storage_engine= @save_storage_engine; +set default_storage_engine= @save_storage_engine; set optimizer_switch=default; === modified file 'mysql-test/r/innodb_mrr.result' --- a/mysql-test/r/innodb_mrr.result 2010-08-23 11:28:58 +0000 +++ b/mysql-test/r/innodb_mrr.result 2010-11-05 08:30:31 +0000 @@ -1,6 +1,6 @@ set optimizer_switch='mrr=on'; -set @save_storage_engine= @@storage_engine; -set storage_engine=InnoDB; +set @save_storage_engine= @@default_storage_engine; +set default_storage_engine=InnoDB; create table t1(a int); show create table t1; Table Create Table @@ -528,7 +528,7 @@ REPEATABLE-READ START TRANSACTION; EXPLAIN SELECT * FROM t1 WHERE a > 2 FOR UPDATE; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 range a a 5 NULL 2 Using where; Using MRR +1 SIMPLE t1 range a a 5 NULL 2 Using index condition; Using MRR SELECT * FROM t1 WHERE a > 2 FOR UPDATE; dummy a b 3 3 3 @@ -558,5 +558,5 @@ ROLLBACK; ROLLBACK; DROP TABLE t1; COMMIT; -set storage_engine= @save_storage_engine; +set default_storage_engine= @save_storage_engine; set optimizer_switch=default; === modified file 'mysql-test/r/innodb_mrr_all.result' --- a/mysql-test/r/innodb_mrr_all.result 2010-08-23 11:28:58 +0000 +++ b/mysql-test/r/innodb_mrr_all.result 2010-11-05 08:30:31 +0000 @@ -1,6 +1,6 @@ set optimizer_switch='semijoin=on,materialization=on,firstmatch=on,loosescan=on,index_condition_pushdown=on,mrr=on'; -set @save_storage_engine= @@storage_engine; -set storage_engine=InnoDB; +set @save_storage_engine= @@default_storage_engine; +set default_storage_engine=InnoDB; create table t1(a int); show create table t1; Table Create Table @@ -528,7 +528,7 @@ REPEATABLE-READ START TRANSACTION; EXPLAIN SELECT * FROM t1 WHERE a > 2 FOR UPDATE; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 range a a 5 NULL 2 Using where; Using MRR +1 SIMPLE t1 range a a 5 NULL 2 Using index condition; Using MRR SELECT * FROM t1 WHERE a > 2 FOR UPDATE; dummy a b 3 3 3 @@ -558,5 +558,5 @@ ROLLBACK; ROLLBACK; DROP TABLE t1; COMMIT; -set storage_engine= @save_storage_engine; +set default_storage_engine= @save_storage_engine; set optimizer_switch=default; === modified file 'mysql-test/r/innodb_mrr_icp.result' --- a/mysql-test/r/innodb_mrr_icp.result 2010-08-23 11:28:58 +0000 +++ b/mysql-test/r/innodb_mrr_icp.result 2010-11-05 08:30:31 +0000 @@ -1,6 +1,6 @@ set optimizer_switch='index_condition_pushdown=on,mrr=on'; -set @save_storage_engine= @@storage_engine; -set storage_engine=InnoDB; +set @save_storage_engine= @@default_storage_engine; +set default_storage_engine=InnoDB; create table t1(a int); show create table t1; Table Create Table @@ -528,7 +528,7 @@ REPEATABLE-READ START TRANSACTION; EXPLAIN SELECT * FROM t1 WHERE a > 2 FOR UPDATE; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 range a a 5 NULL 2 Using where; Using MRR +1 SIMPLE t1 range a a 5 NULL 2 Using index condition; Using MRR SELECT * FROM t1 WHERE a > 2 FOR UPDATE; dummy a b 3 3 3 @@ -558,5 +558,5 @@ ROLLBACK; ROLLBACK; DROP TABLE t1; COMMIT; -set storage_engine= @save_storage_engine; +set default_storage_engine= @save_storage_engine; set optimizer_switch=default; === modified file 'mysql-test/r/innodb_mrr_none.result' --- a/mysql-test/r/innodb_mrr_none.result 2010-11-04 15:23:00 +0000 +++ b/mysql-test/r/innodb_mrr_none.result 2010-11-05 08:30:31 +0000 @@ -527,7 +527,7 @@ REPEATABLE-READ START TRANSACTION; EXPLAIN SELECT * FROM t1 WHERE a > 2 FOR UPDATE; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 range a a 5 NULL 2 Using where; Using MRR +1 SIMPLE t1 range a a 5 NULL 2 Using index condition; Using MRR SELECT * FROM t1 WHERE a > 2 FOR UPDATE; dummy a b 3 3 3 === modified file 'mysql-test/r/select_all.result' --- a/mysql-test/r/select_all.result 2010-10-21 12:38:52 +0000 +++ b/mysql-test/r/select_all.result 2010-11-05 08:30:31 +0000 @@ -511,7 +511,7 @@ insert into tmp select * from t3; insert into t3 select * from tmp; alter table t3 add t2nr int not null auto_increment primary key first; drop table tmp; -SET SQL_BIG_TABLES=1; +SET BIG_TABLES=1; select distinct concat(fld3," ",fld3) as namn from t2,t3 where t2.fld1=t3.t2nr order by namn limit 10; namn Abraham Abraham @@ -524,7 +524,7 @@ ammonium ammonium analyzable analyzable animals animals animized animized -SET SQL_BIG_TABLES=0; +SET BIG_TABLES=0; select distinct concat(fld3," ",fld3) from t2,t3 where t2.fld1=t3.t2nr order by fld3 limit 10; concat(fld3," ",fld3) Abraham Abraham @@ -561,7 +561,7 @@ attendants 1 bedlam 1 bedpost 1 boasted 1 -SET SQL_BIG_TABLES=1; +SET BIG_TABLES=1; select distinct fld3,count(*) from t2 group by companynr,fld3 limit 10; fld3 count(*) affixed 1 @@ -574,7 +574,7 @@ attendants 1 bedlam 1 bedpost 1 boasted 1 -SET SQL_BIG_TABLES=0; +SET BIG_TABLES=0; select distinct fld3,repeat("a",length(fld3)),count(*) from t2 group by companynr,fld3 limit 100,10; fld3 repeat("a",length(fld3)) count(*) circus aaaaaa 1 @@ -4944,5 +4944,4 @@ avg(distinct(t1.a)) 0 DROP TABLE t1; # End of test BUG#57203 - set optimizer_switch=default; === modified file 'mysql-test/r/select_all_jcl6.result' --- a/mysql-test/r/select_all_jcl6.result 2010-09-30 15:01:59 +0000 +++ b/mysql-test/r/select_all_jcl6.result 2010-11-05 08:30:31 +0000 @@ -515,7 +515,7 @@ insert into tmp select * from t3; insert into t3 select * from tmp; alter table t3 add t2nr int not null auto_increment primary key first; drop table tmp; -SET SQL_BIG_TABLES=1; +SET BIG_TABLES=1; select distinct concat(fld3," ",fld3) as namn from t2,t3 where t2.fld1=t3.t2nr order by namn limit 10; namn Abraham Abraham @@ -528,7 +528,7 @@ ammonium ammonium analyzable analyzable animals animals animized animized -SET SQL_BIG_TABLES=0; +SET BIG_TABLES=0; select distinct concat(fld3," ",fld3) from t2,t3 where t2.fld1=t3.t2nr order by fld3 limit 10; concat(fld3," ",fld3) Abraham Abraham @@ -565,7 +565,7 @@ attendants 1 bedlam 1 bedpost 1 boasted 1 -SET SQL_BIG_TABLES=1; +SET BIG_TABLES=1; select distinct fld3,count(*) from t2 group by companynr,fld3 limit 10; fld3 count(*) affixed 1 @@ -578,7 +578,7 @@ attendants 1 bedlam 1 bedpost 1 boasted 1 -SET SQL_BIG_TABLES=0; +SET BIG_TABLES=0; select distinct fld3,repeat("a",length(fld3)),count(*) from t2 group by companynr,fld3 limit 100,10; fld3 repeat("a",length(fld3)) count(*) circus aaaaaa 1 @@ -4929,6 +4929,25 @@ col_int_key DROP VIEW view_t1; DROP TABLE t1; # End of test BUG#54515 +# +# Bug #57203 Assertion `field_length <= 255' failed. +# +SELECT coalesce((avg(distinct (geomfromtext("point(25379 -22010)"))))) +UNION ALL +SELECT coalesce((avg(distinct (geomfromtext("point(25379 -22010)"))))) +AS foo +; +coalesce((avg(distinct (geomfromtext("point(25379 -22010)"))))) +0.0000 +0.0000 +CREATE table t1(a text); +INSERT INTO t1 VALUES (''), (''); +SELECT avg(distinct(t1.a)) FROM t1, t1 t2 +GROUP BY t2.a ORDER BY t1.a; +avg(distinct(t1.a)) +0 +DROP TABLE t1; +# End of test BUG#57203 set optimizer_switch=default; set optimizer_join_cache_level=default; show variables like 'optimizer_join_cache_level'; === modified file 'mysql-test/r/select_icp_mrr.result' --- a/mysql-test/r/select_icp_mrr.result 2010-09-30 15:01:59 +0000 +++ b/mysql-test/r/select_icp_mrr.result 2010-11-05 08:30:31 +0000 @@ -511,7 +511,7 @@ insert into tmp select * from t3; insert into t3 select * from tmp; alter table t3 add t2nr int not null auto_increment primary key first; drop table tmp; -SET SQL_BIG_TABLES=1; +SET BIG_TABLES=1; select distinct concat(fld3," ",fld3) as namn from t2,t3 where t2.fld1=t3.t2nr order by namn limit 10; namn Abraham Abraham @@ -524,7 +524,7 @@ ammonium ammonium analyzable analyzable animals animals animized animized -SET SQL_BIG_TABLES=0; +SET BIG_TABLES=0; select distinct concat(fld3," ",fld3) from t2,t3 where t2.fld1=t3.t2nr order by fld3 limit 10; concat(fld3," ",fld3) Abraham Abraham @@ -561,7 +561,7 @@ attendants 1 bedlam 1 bedpost 1 boasted 1 -SET SQL_BIG_TABLES=1; +SET BIG_TABLES=1; select distinct fld3,count(*) from t2 group by companynr,fld3 limit 10; fld3 count(*) affixed 1 @@ -574,7 +574,7 @@ attendants 1 bedlam 1 bedpost 1 boasted 1 -SET SQL_BIG_TABLES=0; +SET BIG_TABLES=0; select distinct fld3,repeat("a",length(fld3)),count(*) from t2 group by companynr,fld3 limit 100,10; fld3 repeat("a",length(fld3)) count(*) circus aaaaaa 1 @@ -4925,4 +4925,23 @@ col_int_key DROP VIEW view_t1; DROP TABLE t1; # End of test BUG#54515 +# +# Bug #57203 Assertion `field_length <= 255' failed. +# +SELECT coalesce((avg(distinct (geomfromtext("point(25379 -22010)"))))) +UNION ALL +SELECT coalesce((avg(distinct (geomfromtext("point(25379 -22010)"))))) +AS foo +; +coalesce((avg(distinct (geomfromtext("point(25379 -22010)"))))) +0.0000 +0.0000 +CREATE table t1(a text); +INSERT INTO t1 VALUES (''), (''); +SELECT avg(distinct(t1.a)) FROM t1, t1 t2 +GROUP BY t2.a ORDER BY t1.a; +avg(distinct(t1.a)) +0 +DROP TABLE t1; +# End of test BUG#57203 set optimizer_switch=default; === modified file 'mysql-test/r/select_icp_mrr_jcl6.result' --- a/mysql-test/r/select_icp_mrr_jcl6.result 2010-09-30 15:01:59 +0000 +++ b/mysql-test/r/select_icp_mrr_jcl6.result 2010-11-05 08:30:31 +0000 @@ -515,7 +515,7 @@ insert into tmp select * from t3; insert into t3 select * from tmp; alter table t3 add t2nr int not null auto_increment primary key first; drop table tmp; -SET SQL_BIG_TABLES=1; +SET BIG_TABLES=1; select distinct concat(fld3," ",fld3) as namn from t2,t3 where t2.fld1=t3.t2nr order by namn limit 10; namn Abraham Abraham @@ -528,7 +528,7 @@ ammonium ammonium analyzable analyzable animals animals animized animized -SET SQL_BIG_TABLES=0; +SET BIG_TABLES=0; select distinct concat(fld3," ",fld3) from t2,t3 where t2.fld1=t3.t2nr order by fld3 limit 10; concat(fld3," ",fld3) Abraham Abraham @@ -565,7 +565,7 @@ attendants 1 bedlam 1 bedpost 1 boasted 1 -SET SQL_BIG_TABLES=1; +SET BIG_TABLES=1; select distinct fld3,count(*) from t2 group by companynr,fld3 limit 10; fld3 count(*) affixed 1 @@ -578,7 +578,7 @@ attendants 1 bedlam 1 bedpost 1 boasted 1 -SET SQL_BIG_TABLES=0; +SET BIG_TABLES=0; select distinct fld3,repeat("a",length(fld3)),count(*) from t2 group by companynr,fld3 limit 100,10; fld3 repeat("a",length(fld3)) count(*) circus aaaaaa 1 @@ -4929,6 +4929,25 @@ col_int_key DROP VIEW view_t1; DROP TABLE t1; # End of test BUG#54515 +# +# Bug #57203 Assertion `field_length <= 255' failed. +# +SELECT coalesce((avg(distinct (geomfromtext("point(25379 -22010)"))))) +UNION ALL +SELECT coalesce((avg(distinct (geomfromtext("point(25379 -22010)"))))) +AS foo +; +coalesce((avg(distinct (geomfromtext("point(25379 -22010)"))))) +0.0000 +0.0000 +CREATE table t1(a text); +INSERT INTO t1 VALUES (''), (''); +SELECT avg(distinct(t1.a)) FROM t1, t1 t2 +GROUP BY t2.a ORDER BY t1.a; +avg(distinct(t1.a)) +0 +DROP TABLE t1; +# End of test BUG#57203 set optimizer_switch=default; set optimizer_join_cache_level=default; show variables like 'optimizer_join_cache_level'; === modified file 'mysql-test/r/select_none_jcl6.result' --- a/mysql-test/r/select_none_jcl6.result 2010-09-30 15:01:59 +0000 +++ b/mysql-test/r/select_none_jcl6.result 2010-11-05 08:30:31 +0000 @@ -514,7 +514,7 @@ insert into tmp select * from t3; insert into t3 select * from tmp; alter table t3 add t2nr int not null auto_increment primary key first; drop table tmp; -SET SQL_BIG_TABLES=1; +SET BIG_TABLES=1; select distinct concat(fld3," ",fld3) as namn from t2,t3 where t2.fld1=t3.t2nr order by namn limit 10; namn Abraham Abraham @@ -527,7 +527,7 @@ ammonium ammonium analyzable analyzable animals animals animized animized -SET SQL_BIG_TABLES=0; +SET BIG_TABLES=0; select distinct concat(fld3," ",fld3) from t2,t3 where t2.fld1=t3.t2nr order by fld3 limit 10; concat(fld3," ",fld3) Abraham Abraham @@ -564,7 +564,7 @@ attendants 1 bedlam 1 bedpost 1 boasted 1 -SET SQL_BIG_TABLES=1; +SET BIG_TABLES=1; select distinct fld3,count(*) from t2 group by companynr,fld3 limit 10; fld3 count(*) affixed 1 @@ -577,7 +577,7 @@ attendants 1 bedlam 1 bedpost 1 boasted 1 -SET SQL_BIG_TABLES=0; +SET BIG_TABLES=0; select distinct fld3,repeat("a",length(fld3)),count(*) from t2 group by companynr,fld3 limit 100,10; fld3 repeat("a",length(fld3)) count(*) circus aaaaaa 1 @@ -4928,6 +4928,25 @@ col_int_key DROP VIEW view_t1; DROP TABLE t1; # End of test BUG#54515 +# +# Bug #57203 Assertion `field_length <= 255' failed. +# +SELECT coalesce((avg(distinct (geomfromtext("point(25379 -22010)"))))) +UNION ALL +SELECT coalesce((avg(distinct (geomfromtext("point(25379 -22010)"))))) +AS foo +; +coalesce((avg(distinct (geomfromtext("point(25379 -22010)"))))) +0.0000 +0.0000 +CREATE table t1(a text); +INSERT INTO t1 VALUES (''), (''); +SELECT avg(distinct(t1.a)) FROM t1, t1 t2 +GROUP BY t2.a ORDER BY t1.a; +avg(distinct(t1.a)) +0 +DROP TABLE t1; +# End of test BUG#57203 set optimizer_switch=default; set optimizer_join_cache_level=default; show variables like 'optimizer_join_cache_level'; === modified file 'mysql-test/suite/innodb/r/innodb.result' --- a/mysql-test/suite/innodb/r/innodb.result 2010-11-04 15:23:00 +0000 +++ b/mysql-test/suite/innodb/r/innodb.result 2010-11-05 08:30:31 +0000 @@ -781,7 +781,7 @@ create table t1 (a int primary key,b in insert into t1 values (1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1); explain select * from t1 where a > 0 and a < 50; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 range PRIMARY PRIMARY 4 NULL # Using where +1 SIMPLE t1 range PRIMARY PRIMARY 4 NULL # Using index condition drop table t1; create table t1 (id int NOT NULL,id2 int NOT NULL,id3 int NOT NULL,dummy1 char(30),primary key (id,id2),index index_id3 (id3)) engine=innodb; insert into t1 values (0,0,0,'ABCDEFGHIJ'),(2,2,2,'BCDEFGHIJK'),(1,1,1,'CDEFGHIJKL'); === modified file 'mysql-test/suite/innodb/r/innodb_lock_wait_timeout_1.result' --- a/mysql-test/suite/innodb/r/innodb_lock_wait_timeout_1.result 2010-07-05 09:35:24 +0000 +++ b/mysql-test/suite/innodb/r/innodb_lock_wait_timeout_1.result 2010-11-05 08:30:31 +0000 @@ -119,7 +119,7 @@ key PRIMARY key_len 4 ref t2.a rows 1 -Extra Using where +Extra Using index condition; Using where id 2 select_type DERIVED table NULL @@ -323,7 +323,7 @@ key PRIMARY key_len 4 ref t2.a rows 1 -Extra Using where +Extra Using index condition; Using where id 2 select_type DERIVED table NULL === modified file 'mysql-test/t/innodb_icp.test' --- a/mysql-test/t/innodb_icp.test 2010-06-18 08:45:53 +0000 +++ b/mysql-test/t/innodb_icp.test 2010-11-05 08:30:31 +0000 @@ -24,10 +24,10 @@ if (`select locate('mrr', @@optimizer_sw --enable_query_log -set @save_storage_engine= @@storage_engine; -set storage_engine=InnoDB; +set @save_storage_engine= @@default_storage_engine; +set default_storage_engine=InnoDB; --source include/icp_tests.inc -set storage_engine= @save_storage_engine; +set default_storage_engine= @save_storage_engine; set optimizer_switch=default; === modified file 'mysql-test/t/innodb_icp_all.test' --- a/mysql-test/t/innodb_icp_all.test 2010-06-18 08:45:53 +0000 +++ b/mysql-test/t/innodb_icp_all.test 2010-11-05 08:30:31 +0000 @@ -14,10 +14,10 @@ set optimizer_switch='semijoin=on,materialization=on,firstmatch=on,loosescan=on,index_condition_pushdown=on,mrr=on'; -set @save_storage_engine= @@storage_engine; -set storage_engine=InnoDB; +set @save_storage_engine= @@default_storage_engine; +set default_storage_engine=InnoDB; --source include/icp_tests.inc -set storage_engine= @save_storage_engine; +set default_storage_engine= @save_storage_engine; set optimizer_switch=default; === modified file 'mysql-test/t/innodb_mrr.test' --- a/mysql-test/t/innodb_mrr.test 2010-06-18 08:45:53 +0000 +++ b/mysql-test/t/innodb_mrr.test 2010-11-05 08:30:31 +0000 @@ -23,12 +23,12 @@ if (`select locate('index_condition_push } --enable_query_log -set @save_storage_engine= @@storage_engine; -set storage_engine=InnoDB; +set @save_storage_engine= @@default_storage_engine; +set default_storage_engine=InnoDB; --source include/mrr_tests.inc --source include/mrr_innodb_tests.inc -set storage_engine= @save_storage_engine; +set default_storage_engine= @save_storage_engine; set optimizer_switch=default; === modified file 'mysql-test/t/innodb_mrr_all.test' --- a/mysql-test/t/innodb_mrr_all.test 2010-06-18 08:45:53 +0000 +++ b/mysql-test/t/innodb_mrr_all.test 2010-11-05 08:30:31 +0000 @@ -13,12 +13,12 @@ set optimizer_switch='semijoin=on,materialization=on,firstmatch=on,loosescan=on,index_condition_pushdown=on,mrr=on'; -set @save_storage_engine= @@storage_engine; -set storage_engine=InnoDB; +set @save_storage_engine= @@default_storage_engine; +set default_storage_engine=InnoDB; --source include/mrr_tests.inc --source include/mrr_innodb_tests.inc -set storage_engine= @save_storage_engine; +set default_storage_engine= @save_storage_engine; set optimizer_switch=default; === modified file 'mysql-test/t/innodb_mrr_icp.test' --- a/mysql-test/t/innodb_mrr_icp.test 2010-06-18 08:45:53 +0000 +++ b/mysql-test/t/innodb_mrr_icp.test 2010-11-05 08:30:31 +0000 @@ -21,12 +21,12 @@ if (`select locate('materialization', @@ } --enable_query_log -set @save_storage_engine= @@storage_engine; -set storage_engine=InnoDB; +set @save_storage_engine= @@default_storage_engine; +set default_storage_engine=InnoDB; --source include/mrr_tests.inc --source include/mrr_innodb_tests.inc -set storage_engine= @save_storage_engine; +set default_storage_engine= @save_storage_engine; set optimizer_switch=default; --===============8346037403669853572== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/tor.didriksen@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: tor.didriksen@stripped\ # rk3s5e674l1q46t9 # target_branch: file:///export/home/didrik/repo/next-mr-opt-\ # backporting/ # testament_sha1: 12b33cdc1e3dac65eaba428c4708d83cc26ac4f4 # timestamp: 2010-11-05 09:30:37 +0100 # source_branch: file:///export/home/didrik/repo/next-mr-bugfixing/ # base_revision_id: tor.didriksen@stripped\ # e03jb125wh2tmv8b # # Begin bundle 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 --===============8346037403669853572==--