bzr push into mysql-next-mr-bugfixing branch (tor.didriksen:3305 to 3306) Bug#50394

[Tor Didriksen]

 3306 Tor Didriksen	2010-09-29
      Bug#50394 Regression in EXPLAIN with index scan, LIMIT, GROUP BY and ORDER BY computed col
     @ mysql-test/r/join_cache_jcl1.result
        Correct the rows estimate.

    modified:
      mysql-test/r/join_cache_jcl1.result
 3305 Vladislav Vaintroub	2010-09-29 [merge]
      merge

    modified:
      cmake/cmake_parse_arguments.cmake
      cmake/install_macros.cmake
      cmake/libutils.cmake
      cmake/mysql_add_executable.cmake
      cmake/plugin.cmake
=== modified file 'mysql-test/r/join_cache_jcl1.result'
--- a/mysql-test/r/join_cache_jcl1.result	2010-09-20 15:05:13 +0000
+++ b/mysql-test/r/join_cache_jcl1.result	2010-09-29 12:49:37 +0000
@@ -2219,7 +2219,7 @@ GROUP BY t1.col_int_key
 ORDER BY t1.col_int_key, t1.col_datetime
 LIMIT 2;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	index	NULL	col_int_key	5	NULL	2	Using temporary; Using filesort
+1	SIMPLE	t1	index	NULL	col_int_key	5	NULL	3	Using temporary; Using filesort
 1	SIMPLE	t2	ref	col_int_key	col_int_key	5	const	1	Using where
 SELECT t1.col_int_key, t1.col_datetime 
 FROM t1,t2


Attachment: [text/bzr-bundle] bzr/[e-mail]