From: Jorgen Loland
Date: December 17 2010 9:02am
Subject: bzr commit into mysql-5.5-bugteam branch (jorgen.loland:3208) Bug#58985
List-Archive: http://lists.mysql.com/commits/127143
X-Bug: 58985
Message-Id: <20101217090227.5F680AE6@atum21.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2169839370471612597=="

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

#At file:///export/home/jl208045/mysql/mysql-5.5-bugteam/ based on revid:luis.soares@stripped

 3208 Jorgen Loland	2010-12-17
      BUG#58985: Assertion tab->quick->index != 64 failed in 
                 make_join_select() in sql_select.cc
      
      Caused by incorrect ASSERT introduced by BUG#58456. Quick selects 
      may have index == MAX_KEY if it merges indices.
     @ sql/sql_select.cc
        Removed ASSERT. Quick selects may have index == MAX_KEY if it merges indices.

    modified:
      sql/sql_select.cc
=== modified file 'sql/sql_select.cc'
--- a/sql/sql_select.cc	2010-12-16 18:43:21 +0000
+++ b/sql/sql_select.cc	2010-12-17 09:02:24 +0000
@@ -6504,7 +6504,6 @@ make_join_select(JOIN *join,SQL_SELECT *
               ((tab->type != JT_CONST && tab->type != JT_REF) ||
                (uint)tab->ref.key == tab->quick->index))
           {
-            DBUG_ASSERT(tab->quick->index != MAX_KEY);
 	    sel->quick=tab->quick;		// Use value from get_quick_...
 	    sel->quick_keys.clear_all();
 	    sel->needed_reg.clear_all();


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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: jorgen.loland@stripped\
#   bw6y486ip401upg3
# target_branch: file:///export/home/jl208045/mysql/mysql-5.5-bugteam/
# testament_sha1: 67ac1482aa0893cf558996f75a406d5a54951a86
# timestamp: 2010-12-17 10:02:27 +0100
# base_revision_id: luis.soares@stripped\
#   ys82nqf4yhgqbu7d
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWaJYLp4AAbDfgECQeGP/93qe
PmC////wUAQNd2lHb1QTu7t28JKIaaTBDammQ1MjU8pkPQTEaaYamEGSEYTTE1NGjVNpqPU9J6hk
AwI0ZMjDEg1TU9Mo0NpqDQeoAZMmhoAACPVU9GoB6INNAyBoAAAAAAkophJ5lTE8jU9GSbQjT1NA
xAAA064+rJpPFp133y5i7LdWr2IfI2K9r42ePo0j957cupjGD/A+YzqwXRZRZtNIdrv2mgcIkMO5
6udIkNqEhYO7yDViz6SnKxpfVhffbyYWjWC6irFr34l6iPUyVc2MX3VlF3pzacK5SIoasLrrEGAj
bgQqKjTi5ry0J0aIdcIEEWINiSBxBUa5iptBxvLHC5A4wbctgiRZy2EHehmI7pWxTSCHMB9+XL5r
sOOKUcMQYYboR6uldGQpohoarrA6w8EbM1wJFeSbgUJzyzg4CqAPWb4+AFCkTLYj7HhdVhWYYi8R
OG3HRLJFA3agZaEEAjxobfgi6xDbRQaOV0CiBMey9q1NZLNCoIlSpro8FbMRshrh2E6Uzea3JpfH
DawIeTDZQSaHLcguQKkoIDl/gYGkppExIGwbtdTL1mzJcaQrSLCmCy/WYCDDNbVDNunI2O1Sc8Hj
wtbNKPo/CkA551A2ZcGhmDCoC8C6/ilJiLl3nV9UYGChekpqDFBgpIwaaYRi4E3XWLdGQdFtWfMo
pTl7YbSXSnpSnkMqxJjGN0fyKP1PI4jvYeh5E49j7Mw0hPwlv4miwaoM4oS4Ggq3wadmxIlJRoW1
T9rq8XB+MDx66USKcazjYNMueYfjXRWdMka71w4Dh+buWpKw7eYGBG82it2kNYytr2AxIiSHwd6k
ENYjpdRsyWzm2ZQIzO9R9sqalItDGzsUGHIaF9Gv2GWn5GIV9BhVOVyPI5O6OnY55ubOfuYM+11B
ES73oMevTE2S2zVrZHJmgzJzKbRL3syeba0HC0CwsTFUX23j8GPLB6wcmhMrplHIWqSrYb1i3ugb
u5kq0mwoLOLtzJ36hpEOFWtwswifaufXZn5U3SFJTzrwWUeq6tAylZdv5BkbiMsUyJ4SFSWtmDS0
L0rfXHPDJhC0UyvhwGdqh0T+JYMc/IjDJlV0My0qoHg9q+YBUgVLhuj0QhaQEvGrH4kxcYAi1PHa
cn2KFogNHK/fJzRBHBimGJUlBKiDJAIAIh4sMdfPlNOg0kOEcRY1lbo0w+fiCVoJ6ODj3SNofEyV
CfrkUKudlYUiupYwICiPLWLWnNijlpTE5BFz10g5JbqIAJOTARADniugat+FglXNwgIsEhYcRyGB
jrhsNBNQ1ZWsGQARwvSZ9h48Uc+SosYbJDuS0jThMJFAVq7BdgrOkBoj1sxY3jJAlQ4uNTwoyKgZ
vM3CrNwnXpnJpfar4+iODEN40Cp8lFKRTyGk1kBeWx9JbCUfxdyRThQkKJYLp4A=


--===============2169839370471612597==--