diff options
author | Michael Widenius <monty@askmonty.org> | 2010-12-06 10:25:44 +0200 |
---|---|---|
committer | Michael Widenius <monty@askmonty.org> | 2010-12-06 10:25:44 +0200 |
commit | b7b25dc666a8d331d16231f9fb658af8c05ac694 (patch) | |
tree | 0c7798c2d187db0da7837a70f306a789afc16521 /mysql-test/r/myisam_mrr.result | |
parent | ab5e4eefd5d25c6e0755c2460dbb433a7a9e913b (diff) | |
parent | b3c72b9a02e570a4a66ca0a64e94fe1116976c85 (diff) | |
download | mariadb-git-b7b25dc666a8d331d16231f9fb658af8c05ac694.tar.gz |
Merge with 5.1-release.
- Fixed problem with oqgraph and 'make dist'
Note that after this merge we have a problem show in join_outer where we examine too many rows in one specific case (related to BUG#57024).
This will be fixed when mwl#128 is merged into 5.3.
Diffstat (limited to 'mysql-test/r/myisam_mrr.result')
-rw-r--r-- | mysql-test/r/myisam_mrr.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/myisam_mrr.result b/mysql-test/r/myisam_mrr.result index 5db03db85ac..99e1a6b7292 100644 --- a/mysql-test/r/myisam_mrr.result +++ b/mysql-test/r/myisam_mrr.result @@ -347,7 +347,7 @@ GROUP BY t2.pk ); id select_type table type possible_keys key key_len ref rows filtered Extra 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL NULL Impossible WHERE -2 SUBQUERY t2 ALL int_key int_key 5 3 33.33 Using index condition; Using filesort +2 SUBQUERY t2 ref int_key int_key 5 1 100.00 Using index condition; Using where; Using filesort Warnings: Note 1003 select min(`test`.`t1`.`pk`) AS `MIN(t1.pk)` from `test`.`t1` where 0 DROP TABLE t1, t2; |