bzr push into mysql-6.0-opt branch (sergefp:2810 to 2811)

[Sergey Petrunia]

 2811 Sergey Petrunia	2009-01-26
      Fix test results after last cset (checked)
modified:
  mysql-test/r/subselect.result
  mysql-test/r/subselect_no_mat.result
  mysql-test/r/subselect_no_opts.result
  mysql-test/r/subselect_no_semijoin.result

 2810 Sergey Petrunia	2009-01-26
      BUG#41136: ORDER BY+range access: EXPLAIN shows "Using MRR" while MRR is actually
not used
modified:
  mysql-test/r/myisam_mrr.result
  mysql-test/r/order_by.result
  mysql-test/t/myisam_mrr.test
  sql/handler.cc
  sql/opt_range.cc
  sql/opt_range.h
  sql/sql_select.cc
  storage/falcon/ha_falcon.cpp

=== modified file 'mysql-test/r/subselect.result'
--- a/mysql-test/r/subselect.result	2008-12-29 16:40:21 +0000
+++ b/mysql-test/r/subselect.result	2009-01-26 14:53:51 +0000
@@ -2956,7 +2956,7 @@ ORDER BY t2.c, t2.b LIMIT 1) WHERE t1.a 
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	t1	system	PRIMARY	NULL	NULL	NULL	1	
 1	PRIMARY	r	const	PRIMARY	PRIMARY	4	const	1	
-2	DEPENDENT SUBQUERY	t2	range	b	b	40	NULL	2	Using index condition; Using MRR
+2	DEPENDENT SUBQUERY	t2	range	b	b	40	NULL	2	Using index condition
 SELECT sql_no_cache t1.a, r.a, r.b FROM t1 LEFT JOIN t2 r 
 ON r.a = (SELECT t2.a FROM t2 WHERE t2.c = t1.a AND t2.b <= '359899' 
 ORDER BY t2.c, t2.b LIMIT 1) WHERE t1.a = 10;

=== modified file 'mysql-test/r/subselect_no_mat.result'
--- a/mysql-test/r/subselect_no_mat.result	2008-12-29 16:40:21 +0000
+++ b/mysql-test/r/subselect_no_mat.result	2009-01-26 14:53:51 +0000
@@ -2960,7 +2960,7 @@ ORDER BY t2.c, t2.b LIMIT 1) WHERE t1.a 
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	t1	system	PRIMARY	NULL	NULL	NULL	1	
 1	PRIMARY	r	const	PRIMARY	PRIMARY	4	const	1	
-2	DEPENDENT SUBQUERY	t2	range	b	b	40	NULL	2	Using index condition; Using MRR
+2	DEPENDENT SUBQUERY	t2	range	b	b	40	NULL	2	Using index condition
 SELECT sql_no_cache t1.a, r.a, r.b FROM t1 LEFT JOIN t2 r 
 ON r.a = (SELECT t2.a FROM t2 WHERE t2.c = t1.a AND t2.b <= '359899' 
 ORDER BY t2.c, t2.b LIMIT 1) WHERE t1.a = 10;

=== modified file 'mysql-test/r/subselect_no_opts.result'
--- a/mysql-test/r/subselect_no_opts.result	2008-12-29 16:40:21 +0000
+++ b/mysql-test/r/subselect_no_opts.result	2009-01-26 14:53:51 +0000
@@ -2960,7 +2960,7 @@ ORDER BY t2.c, t2.b LIMIT 1) WHERE t1.a 
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	t1	system	PRIMARY	NULL	NULL	NULL	1	
 1	PRIMARY	r	const	PRIMARY	PRIMARY	4	const	1	
-2	DEPENDENT SUBQUERY	t2	range	b	b	40	NULL	2	Using index condition; Using MRR
+2	DEPENDENT SUBQUERY	t2	range	b	b	40	NULL	2	Using index condition
 SELECT sql_no_cache t1.a, r.a, r.b FROM t1 LEFT JOIN t2 r 
 ON r.a = (SELECT t2.a FROM t2 WHERE t2.c = t1.a AND t2.b <= '359899' 
 ORDER BY t2.c, t2.b LIMIT 1) WHERE t1.a = 10;

=== modified file 'mysql-test/r/subselect_no_semijoin.result'
--- a/mysql-test/r/subselect_no_semijoin.result	2008-12-29 16:40:21 +0000
+++ b/mysql-test/r/subselect_no_semijoin.result	2009-01-26 14:53:51 +0000
@@ -2960,7 +2960,7 @@ ORDER BY t2.c, t2.b LIMIT 1) WHERE t1.a 
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	t1	system	PRIMARY	NULL	NULL	NULL	1	
 1	PRIMARY	r	const	PRIMARY	PRIMARY	4	const	1	
-2	DEPENDENT SUBQUERY	t2	range	b	b	40	NULL	2	Using index condition; Using MRR
+2	DEPENDENT SUBQUERY	t2	range	b	b	40	NULL	2	Using index condition
 SELECT sql_no_cache t1.a, r.a, r.b FROM t1 LEFT JOIN t2 r 
 ON r.a = (SELECT t2.a FROM t2 WHERE t2.c = t1.a AND t2.b <= '359899' 
 ORDER BY t2.c, t2.b LIMIT 1) WHERE t1.a = 10;