diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2010-02-21 09:33:54 +0200 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2010-02-21 09:33:54 +0200 |
| commit | 3ffa8891846da55e1f9e7c0317f1d00b5b342a8a (patch) | |
| tree | bb8c84f41f7fcd92c84f33d809c26ecec111d3af /mysql-test/t | |
| parent | 71a2047d6bf761658f4dd66602950e639732d0c0 (diff) | |
| download | mariadb-git-3ffa8891846da55e1f9e7c0317f1d00b5b342a8a.tar.gz | |
Fix buildbot failure: take into account that there is no optimizer_switch flag
for table elimination in debug builds.
Diffstat (limited to 'mysql-test/t')
| -rw-r--r-- | mysql-test/t/subselect_no_mat.test | 2 | ||||
| -rw-r--r-- | mysql-test/t/subselect_no_opts.test | 2 | ||||
| -rw-r--r-- | mysql-test/t/subselect_no_semijoin.test | 2 | ||||
| -rw-r--r-- | mysql-test/t/subselect_sj.test | 8 |
4 files changed, 14 insertions, 0 deletions
diff --git a/mysql-test/t/subselect_no_mat.test b/mysql-test/t/subselect_no_mat.test index 6f105ed50d3..d9b95ea7261 100644 --- a/mysql-test/t/subselect_no_mat.test +++ b/mysql-test/t/subselect_no_mat.test @@ -1,11 +1,13 @@ # # Run subselect.test without semi-join optimization (test materialize) # +--replace_regex /,table_elimination=on// show variables like 'optimizer_switch'; set optimizer_switch='materialization=off'; --source t/subselect.test set optimizer_switch=default; +--replace_regex /,table_elimination=on// show variables like 'optimizer_switch'; diff --git a/mysql-test/t/subselect_no_opts.test b/mysql-test/t/subselect_no_opts.test index 358b843b53c..1ce66ac4d33 100644 --- a/mysql-test/t/subselect_no_opts.test +++ b/mysql-test/t/subselect_no_opts.test @@ -1,11 +1,13 @@ # # Run subselect.test without semi-join optimization (test materialize) # +--replace_regex /,table_elimination=on// show variables like 'optimizer_switch'; set optimizer_switch='materialization=off,semijoin=off'; --source t/subselect.test set optimizer_switch=default; +--replace_regex /,table_elimination=on// show variables like 'optimizer_switch'; diff --git a/mysql-test/t/subselect_no_semijoin.test b/mysql-test/t/subselect_no_semijoin.test index e5a6e170302..ab0eee26216 100644 --- a/mysql-test/t/subselect_no_semijoin.test +++ b/mysql-test/t/subselect_no_semijoin.test @@ -1,11 +1,13 @@ # # Run subselect.test without semi-join optimization (test materialize) # +--replace_regex /,table_elimination=on// show variables like 'optimizer_switch'; set optimizer_switch='semijoin=off'; --source t/subselect.test set optimizer_switch=default; +--replace_regex /,table_elimination=on// show variables like 'optimizer_switch'; diff --git a/mysql-test/t/subselect_sj.test b/mysql-test/t/subselect_sj.test index 087936bf443..150ba2f7fe6 100644 --- a/mysql-test/t/subselect_sj.test +++ b/mysql-test/t/subselect_sj.test @@ -99,27 +99,35 @@ explain extended select * from t1 where a in (select pk from t10 where pk<3); select @@optimizer_switch; set optimizer_switch='default,materialization=off'; +--replace_regex /,table_elimination=on// select @@optimizer_switch; set optimizer_switch='default,semijoin=off'; +--replace_regex /,table_elimination=on// select @@optimizer_switch; set optimizer_switch='default,loosescan=off'; +--replace_regex /,table_elimination=on// select @@optimizer_switch; set optimizer_switch='default,semijoin=off,materialization=off'; +--replace_regex /,table_elimination=on// select @@optimizer_switch; set optimizer_switch='default,materialization=off,semijoin=off'; +--replace_regex /,table_elimination=on// select @@optimizer_switch; set optimizer_switch='default,semijoin=off,materialization=off,loosescan=off'; +--replace_regex /,table_elimination=on// select @@optimizer_switch; set optimizer_switch='default,semijoin=off,loosescan=off'; +--replace_regex /,table_elimination=on// select @@optimizer_switch; set optimizer_switch='default,materialization=off,loosescan=off'; +--replace_regex /,table_elimination=on// select @@optimizer_switch; set optimizer_switch=default; |