diff options
| author | Vladislav Vaintroub <wlad@montyprogram.com> | 2010-12-06 13:16:49 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@montyprogram.com> | 2010-12-06 13:16:49 +0100 |
| commit | bfcc62c748e0918d67c726c7a96d2cd04faba23c (patch) | |
| tree | 49110ac4734bd02544139992a7367ba71926d0c0 /mysql-test | |
| parent | b3c72b9a02e570a4a66ca0a64e94fe1116976c85 (diff) | |
| parent | 6ad448115bd829360145c865b659dfea65b12907 (diff) | |
| download | mariadb-git-bfcc62c748e0918d67c726c7a96d2cd04faba23c.tar.gz | |
merge
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/index_merge_innodb.result | 2 | ||||
| -rw-r--r-- | mysql-test/t/index_merge_innodb.test | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/mysql-test/r/index_merge_innodb.result b/mysql-test/r/index_merge_innodb.result index e5e044034d5..4c561da6420 100644 --- a/mysql-test/r/index_merge_innodb.result +++ b/mysql-test/r/index_merge_innodb.result @@ -686,7 +686,7 @@ INSERT INTO t1 VALUES (1000000, 0, 0); SET SESSION sort_buffer_size = 1024*36; EXPLAIN SELECT COUNT(*) FROM -(SELECT * FROM t1 +(SELECT * FROM t1 FORCE INDEX(primary,idx) WHERE a BETWEEN 2 AND 7 OR pk=1000000) AS t; id select_type table type possible_keys key key_len ref rows Extra 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL Select tables optimized away diff --git a/mysql-test/t/index_merge_innodb.test b/mysql-test/t/index_merge_innodb.test index e68f414e0bc..7c6ffaace4f 100644 --- a/mysql-test/t/index_merge_innodb.test +++ b/mysql-test/t/index_merge_innodb.test @@ -64,9 +64,11 @@ INSERT INTO t1 VALUES (1000000, 0, 0); SET SESSION sort_buffer_size = 1024*36; +# We have to use FORCE INDEX here as Innodb gives inconsistent estimates +# which causes different query plans. EXPLAIN SELECT COUNT(*) FROM - (SELECT * FROM t1 + (SELECT * FROM t1 FORCE INDEX(primary,idx) WHERE a BETWEEN 2 AND 7 OR pk=1000000) AS t; SELECT COUNT(*) FROM (SELECT * FROM t1 |