From: Tor Didriksen
Date: September 29 2010 1:11pm
Subject: bzr push into mysql-next-mr-bugfixing branch (tor.didriksen:3305 to 3306)
 Bug#50394
List-Archive: http://lists.mysql.com/commits/119415
X-Bug: 50394
Message-Id: <20100929131140.A9188372B@atum07.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7260717850819240061=="

--===============7260717850819240061==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

 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


--===============7260717850819240061==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/tor.didriksen@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: tor.didriksen@stripped\
#   eq32enpazk1jck7t
# target_branch: file:///export/home/didrik/repo/next-mr-bf/
# testament_sha1: fb7ef9f76204856000dae8231178c39996ca7903
# timestamp: 2010-09-29 15:11:40 +0200
# base_revision_id: vvaintroub@stripped\
#   7icbrvmm4fyim52g
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWYUXLMEAAZ5fgEAwWGf//36n
3mC////wUAQHjRXcwUAAammhCeqbQeiT1PJNM0jygABjU09T1HimgjUSGmPUTNTTIA0aAABoAAAG
qnsgUGgBoGgAAyaAAAAOaMmJgAmIwI0wIMRgmTAIwSSCTaCMQNE0yYCE9Rk0T1PU2p6hoepkhGvg
7hlctOstAusIFMoCSJuMAVysYqZKYVR+6yBFZ8oxKYCjIZglnh42noFWSjYZXb6/vUzBZmwkh+eA
xHs5NJyyJr8RzClz3+tsy/tIqVvgJ0Y3fdck/Nmjn5U042iQTAQQb3JrX0FcpsMtc4pNuTkhgT05
zL52LImerfK0SnCAUdumMD37sb7LFYyymySRhuTltiW93vV6QUZ0mGLL9GGAlKNcIUPbbREyI5K7
iieQRuunFQSICCiZKQIZIpeihi5UizVpW3TJj/R8nRcI67nhIPe8Vb1pU36SzYVRZdnkKw4SSwF1
+0e5pPi+KbCxMNVNXqgoJScV1A/Azo8VY61YzzoxXsnLWvzQpJ81tZAbjiKsa1JL7YqQsQHLMOOC
eCtoIxhDoDTy7txYo5xxLmgoUknhFysjlduW8U+SZRo0SlNRcPN04jXQ5hGK1LBK+hpyMOCmpixV
jR0tcSCaSHUsQsjBiYsHEUS2EYQ0BqifQaOmkZM+FpOHUUu7jiQtAG15pAiJo29g9TYyswdtf4Y3
BdwtR3A2qvfhvvefgx1Bi1vUiJAdMSaEgyAL49kjiODZ29h5d/kj080FR3kT4SwkwfheV1tUc30w
of07e5Qbx0PF02X47vA+yvvPEb6a6Mq8Ao8pZvwiHUq+p0RN6gOQdXH7AsL9/qq6GM+KzrLK8tkk
zpHKdRiqMvXKJag1GydI9KebYt7kD037V3DOrG14xxjgdvDnBqnUlROEXcpNg27x1+ibhQ1FXz05
1RDubr/xxDQI6hXHemXaLrU8r9MGnFNnDXgnnNAGAOWipkyInT6hljoVJ0FMDJw/oUfs+1spyyDh
+r2ToqJq5K3g3U5Ds2nkzbAc5FORbcCtUxPR1JsNvQPXsQP+Kk8wCKxeygs5sRpD5PspymH/s61Z
8EyM4dfB/Hw5CqIKteP8P2HeJhTbEwdvIRy0VhgMASDDreE2SRgQMGbLxFTRr3LIqUjMqFsf2D2q
wjybSpoxLHyf+E6eLRmZPQPQ7XAeJ+BwTUrAA9kwMmV67MXeM2KCn3ozAE6IRPvwQWoGDpSvzqfB
XThmiGXIzBnFAmafTFn2BlQd9CJ75ux6DbgMjPQujVWSR8/qiG3GSKtwihZX5HKaBM1aZVc5rh88
879gita6vYlrB+daqy1qud7VbkQScDIa/4luri8ZbOd0OnynmIzDPdunn0W3weNnne2rFTYshkGc
dIBYlMyozrnQr/HzjIWHZ8FSuWoMKsUFuX1y2dFOZ79CrU8UVBauEV3InuvGFSKXnb/4u5IpwoSE
KLlmCA==


--===============7260717850819240061==--