diff options
| author | Igor Babaev <igor@askmonty.org> | 2010-12-07 14:48:04 -0800 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2010-12-07 14:48:04 -0800 |
| commit | adb9fd9578f61a73ae224ede3bcb7adef863c1e3 (patch) | |
| tree | f81da060e8dba7a53d2c8b802de4795596575f01 | |
| parent | f0f9ab69c7c75241ce0a28a33132e504c39f4a6d (diff) | |
| download | mariadb-git-adb9fd9578f61a73ae224ede3bcb7adef863c1e3.tar.gz | |
Made sure that SELECT from the test case for bug BUG#56862/64041 uses
the same execution plan that is in the output of the corresponding
EXPLAIN.
| -rw-r--r-- | mysql-test/r/index_merge_innodb.result | 2 | ||||
| -rw-r--r-- | mysql-test/t/index_merge_innodb.test | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/index_merge_innodb.result b/mysql-test/r/index_merge_innodb.result index 4c561da6420..fdc5b57a2e3 100644 --- a/mysql-test/r/index_merge_innodb.result +++ b/mysql-test/r/index_merge_innodb.result @@ -692,7 +692,7 @@ 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 2 DERIVED t1 index_merge PRIMARY,idx idx,PRIMARY 5,4 NULL 11419 Using sort_union(idx,PRIMARY); Using where SELECT COUNT(*) FROM -(SELECT * FROM t1 +(SELECT * FROM t1 FORCE INDEX(primary,idx) WHERE a BETWEEN 2 AND 7 OR pk=1000000) AS t; COUNT(*) 6145 diff --git a/mysql-test/t/index_merge_innodb.test b/mysql-test/t/index_merge_innodb.test index 7c6ffaace4f..04f8c5a659b 100644 --- a/mysql-test/t/index_merge_innodb.test +++ b/mysql-test/t/index_merge_innodb.test @@ -71,7 +71,7 @@ SELECT COUNT(*) FROM (SELECT * FROM t1 FORCE INDEX(primary,idx) WHERE a BETWEEN 2 AND 7 OR pk=1000000) AS t; SELECT COUNT(*) FROM - (SELECT * FROM t1 + (SELECT * FROM t1 FORCE INDEX(primary,idx) WHERE a BETWEEN 2 AND 7 OR pk=1000000) AS t; --replace_column 9 # |