diff options
| author | Igor Babaev <igor@askmonty.org> | 2011-05-16 22:39:43 -0700 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2011-05-16 22:39:43 -0700 |
| commit | 704f97035fed1a454ea3300d2ad5dda906dbce50 (patch) | |
| tree | 7204d0246b026782b99b8effe9a0ec682e90e209 /mysql-test/r/index_merge_innodb.result | |
| parent | 7b797fe66d7167a8f5cbb071a06a640a627f2186 (diff) | |
| parent | a8be09a9f26b43139ad84ead314898d23394f673 (diff) | |
| download | mariadb-git-704f97035fed1a454ea3300d2ad5dda906dbce50.tar.gz | |
Merged the code of MWL#106 into 5.3
Resolved all conflicts, bad merges and fixed a few minor bugs in the code.
Commented out the queries from multi_update, view, subselect_sj, func_str,
derived_view, view_grant that failed either with crashes in ps-protocol or
with wrong results.
The failures are clear indications of some bugs in the code and these bugs
are to be fixed.
Diffstat (limited to 'mysql-test/r/index_merge_innodb.result')
| -rw-r--r-- | mysql-test/r/index_merge_innodb.result | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/mysql-test/r/index_merge_innodb.result b/mysql-test/r/index_merge_innodb.result index 17663076ca3..d935cdbddbc 100644 --- a/mysql-test/r/index_merge_innodb.result +++ b/mysql-test/r/index_merge_innodb.result @@ -691,8 +691,7 @@ SELECT COUNT(*) FROM (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 -2 DERIVED t1 index_merge PRIMARY,idx idx,PRIMARY 5,4 NULL 11419 Using sort_union(idx,PRIMARY); Using where +1 SIMPLE t1 index_merge PRIMARY,idx idx,PRIMARY 5,4 NULL 11419 Using sort_union(idx,PRIMARY); Using where SELECT COUNT(*) FROM (SELECT * FROM t1 FORCE INDEX(primary,idx) WHERE a BETWEEN 2 AND 7 OR pk=1000000) AS t; @@ -703,8 +702,7 @@ SELECT COUNT(*) FROM (SELECT * FROM t1 IGNORE INDEX(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 # Select tables optimized away -2 DERIVED t1 ALL PRIMARY NULL NULL NULL # Using where +1 SIMPLE t1 ALL PRIMARY NULL NULL NULL # Using where SELECT COUNT(*) FROM (SELECT * FROM t1 IGNORE INDEX(idx) WHERE a BETWEEN 2 AND 7 OR pk=1000000) AS t; |