summaryrefslogtreecommitdiff
path: root/mysql-test/t/subselect_no_mat.test
diff options
context:
space:
mode:
authorSergey Petrunya <psergey@askmonty.org>2010-07-16 12:58:24 +0400
committerSergey Petrunya <psergey@askmonty.org>2010-07-16 12:58:24 +0400
commit13058d8056cea616a39f82d18d1ab061cbbf0bcb (patch)
tree1fde269708463bbe4f91090d6d073e1a78053bf3 /mysql-test/t/subselect_no_mat.test
parent4274e9b5d4c8998e8c47fc7d322d0cdb2210cfe5 (diff)
downloadmariadb-git-13058d8056cea616a39f82d18d1ab061cbbf0bcb.tar.gz
Fix @@optimizer_switch support
- Let "mysqld --help --verbose" list all optimizer options - Make it possible to add new @@optimizer_switch flags w/o causing .result changes all over the testsuite: = Remove "select @@optimizer_switch" from tests that do not need all switches = Move @@optimizer_switch-specific tests to t/optimizer_switch.test
Diffstat (limited to 'mysql-test/t/subselect_no_mat.test')
-rw-r--r--mysql-test/t/subselect_no_mat.test6
1 files changed, 2 insertions, 4 deletions
diff --git a/mysql-test/t/subselect_no_mat.test b/mysql-test/t/subselect_no_mat.test
index d9b95ea7261..5fbbef5caed 100644
--- a/mysql-test/t/subselect_no_mat.test
+++ b/mysql-test/t/subselect_no_mat.test
@@ -1,13 +1,11 @@
#
# Run subselect.test without semi-join optimization (test materialize)
#
---replace_regex /,table_elimination=on//
-show variables like 'optimizer_switch';
+select @@optimizer_switch like '%materialization=on%';
set optimizer_switch='materialization=off';
--source t/subselect.test
set optimizer_switch=default;
---replace_regex /,table_elimination=on//
-show variables like 'optimizer_switch';
+select @@optimizer_switch like '%materialization=on%';