At file:///home/psergey/dev/maria-5.3-subqueries-r7/ ------------------------------------------------------------ revno: 2767 revision-id: psergey@askmonty.org-20100221075312-fc08qgn72dnbudd5 parent: psergey@askmonty.org-20100221073354-d05otp2nklvja9pc committer: Sergey Petrunya <psergey@askmonty.org> branch nick: maria-5.3-subqueries-r7 timestamp: Sun 2010-02-21 09:53:12 +0200 message: Fix buildbot failure: take into account that there is no optimizer_switch flag for table elimination in debug builds. (part 2) === modified file 'mysql-test/r/subselect_sj.result' --- a/mysql-test/r/subselect_sj.result 2010-02-21 07:33:54 +0000 +++ b/mysql-test/r/subselect_sj.result 2010-02-21 07:53:12 +0000 @@ -202,7 +202,7 @@ select @@optimizer_switch; @@optimizer_switch -index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,index_condition_pushdown=on,firstmatch=on,loosescan=on,materialization=on,semijoin=on,table_elimination=on +index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,index_condition_pushdown=on,firstmatch=on,loosescan=on,materialization=on,semijoin=on set optimizer_switch='default,materialization=off'; select @@optimizer_switch; @@optimizer_switch === modified file 'mysql-test/r/subselect_sj_jcl6.result' --- a/mysql-test/r/subselect_sj_jcl6.result 2010-02-21 07:33:54 +0000 +++ b/mysql-test/r/subselect_sj_jcl6.result 2010-02-21 07:53:12 +0000 @@ -206,7 +206,7 @@ select @@optimizer_switch; @@optimizer_switch -index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,index_condition_pushdown=on,firstmatch=on,loosescan=on,materialization=on,semijoin=on,table_elimination=on +index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,index_condition_pushdown=on,firstmatch=on,loosescan=on,materialization=on,semijoin=on set optimizer_switch='default,materialization=off'; select @@optimizer_switch; @@optimizer_switch === modified file 'mysql-test/t/subselect_sj.test' --- a/mysql-test/t/subselect_sj.test 2010-02-21 07:33:54 +0000 +++ b/mysql-test/t/subselect_sj.test 2010-02-21 07:53:12 +0000 @@ -96,6 +96,7 @@ --echo BUG#37120 optimizer_switch allowable values not according to specification --echo +--replace_regex /,table_elimination=on// select @@optimizer_switch; set optimizer_switch='default,materialization=off';