diff options
| author | Igor Babaev <igor@askmonty.org> | 2011-11-24 12:19:37 -0800 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2011-11-24 12:19:37 -0800 |
| commit | adb4e64eaf2bbdb56a553144511820a327a79774 (patch) | |
| tree | 5e2a9c75870541583f2cf01207cf299a71a5c4cd /mysql-test/suite/innodb_plugin | |
| parent | 6fbf8f1926851ecc377b70ad1313b1d213d51010 (diff) | |
| download | mariadb-git-adb4e64eaf2bbdb56a553144511820a327a79774.tar.gz | |
Currently innodb_plugin does not support ICP.
Diffstat (limited to 'mysql-test/suite/innodb_plugin')
| -rw-r--r-- | mysql-test/suite/innodb_plugin/r/innodb_lock_wait_timeout_1.result | 5 | ||||
| -rw-r--r-- | mysql-test/suite/innodb_plugin/t/innodb_lock_wait_timeout_1.test | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/mysql-test/suite/innodb_plugin/r/innodb_lock_wait_timeout_1.result b/mysql-test/suite/innodb_plugin/r/innodb_lock_wait_timeout_1.result index e8ba522af2e..3329d420edc 100644 --- a/mysql-test/suite/innodb_plugin/r/innodb_lock_wait_timeout_1.result +++ b/mysql-test/suite/innodb_plugin/r/innodb_lock_wait_timeout_1.result @@ -97,6 +97,8 @@ insert into t1 values (1,1), (2,null), (3,1), (4,1), # Demonstrate that for the SELECT statement # used later in the test JT_EQ_REF access method is used. # +set @tmp_optimizer_switch=@@optimizer_switch; +set optimizer_switch='index_condition_pushdown=off'; explain select 1 from t1 natural join (select 2 as a, 1 as b union all select 2 as a, 2 as b) as t2 for update; @@ -119,7 +121,7 @@ key PRIMARY key_len 4 ref t2.a rows 1 -Extra Using index condition; Using where +Extra Using where id 2 select_type DERIVED table NULL @@ -150,6 +152,7 @@ key_len NULL ref NULL rows NULL Extra +set optimizer_switch=@tmp_optimizer_switch; # # Demonstrate that the reported SELECT statement # no longer produces warnings. diff --git a/mysql-test/suite/innodb_plugin/t/innodb_lock_wait_timeout_1.test b/mysql-test/suite/innodb_plugin/t/innodb_lock_wait_timeout_1.test index d7272779bdd..5d5f78093a7 100644 --- a/mysql-test/suite/innodb_plugin/t/innodb_lock_wait_timeout_1.test +++ b/mysql-test/suite/innodb_plugin/t/innodb_lock_wait_timeout_1.test @@ -140,9 +140,12 @@ insert into t1 values (1,1), (2,null), (3,1), (4,1), --echo # used later in the test JT_EQ_REF access method is used. --echo # --vertical_results +set @tmp_optimizer_switch=@@optimizer_switch; +set optimizer_switch='index_condition_pushdown=off'; explain select 1 from t1 natural join (select 2 as a, 1 as b union all select 2 as a, 2 as b) as t2 for update; +set optimizer_switch=@tmp_optimizer_switch; --horizontal_results --echo # --echo # Demonstrate that the reported SELECT statement |