diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2011-07-08 18:46:47 +0400 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2011-07-08 18:46:47 +0400 |
| commit | 1492de8563ac6032481fe69189f4f1f1e14fe73b (patch) | |
| tree | 297c4f43de79a2afc07279f9897965b8c7fd0ef9 /mysql-test/r/innodb_icp.result | |
| parent | 4128ec48522534732d16a74cda006dc794748042 (diff) | |
| download | mariadb-git-1492de8563ac6032481fe69189f4f1f1e14fe73b.tar.gz | |
Set the default to be mrr=off,mrr_sort_keys=off:
- Set the default
- Adjust the testcases so that 'new' tests are run with optimizations turned on.
- Pull out relevant tests from "irrelevant" tests and run them with optimizations on.
- Run range.test and innodb.test with both mrr=on and mrr=off
Diffstat (limited to 'mysql-test/r/innodb_icp.result')
| -rw-r--r-- | mysql-test/r/innodb_icp.result | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/r/innodb_icp.result b/mysql-test/r/innodb_icp.result index e4d81a9a3d5..6ed6e0ad393 100644 --- a/mysql-test/r/innodb_icp.result +++ b/mysql-test/r/innodb_icp.result @@ -1,5 +1,7 @@ set @save_storage_engine= @@storage_engine; set storage_engine=InnoDB; +set @innodb_icp_tmp=@@optimizer_switch; +set optimizer_switch='mrr=on,mrr_sort_keys=on,index_condition_pushdown=on'; # # Bug#36981 - "innodb crash when selecting for update" # @@ -200,4 +202,5 @@ COUNT(*) 12 DROP PROCEDURE insert_data; DROP TABLE t1, t2, t3; +set optimizer_switch=@innodb_icp_tmp; set storage_engine= @save_storage_engine; |