From: Jorgen Loland
Date: September 22 2010 6:52am
Subject: bzr commit into mysql-next-mr-bugfixing branch (jorgen.loland:3246)
List-Archive: http://lists.mysql.com/commits/118773
Message-Id: <20100922065252.507B31F02@atum21.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6326042630689800793=="

--===============6326042630689800793==
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-next-mr-opt-backporting-review1/ based on revid:jorgen.loland@stripped

 3246 Jorgen Loland	2010-09-22
      49129. Postfix - join_tab type might be JT_CONST in 
      might_do_join_buffering

    modified:
      sql/sql_select.cc
=== modified file 'sql/sql_select.cc'
--- a/sql/sql_select.cc	2010-09-21 12:38:49 +0000
+++ b/sql/sql_select.cc	2010-09-22 06:51:45 +0000
@@ -1282,7 +1282,8 @@ bool might_do_join_buffering(uint join_c
           ((join_cache_level != 0 && sj_tab->type == JT_ALL) ||
            (join_cache_level > 4 && 
             (sj_tab->type == JT_REF || 
-             sj_tab->type == JT_EQ_REF))));
+             sj_tab->type == JT_EQ_REF ||
+             sj_tab->type == JT_CONST))));
 }
 
 /**


--===============6326042630689800793==
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\
#   4fe3hk8ejj6vml78
# target_branch: file:///export/home/jl208045/mysql/mysql-next-mr-opt-\
#   backporting-review1/
# testament_sha1: 038e787e01e7ac9584d4745f63d83f99a3c2a7c6
# timestamp: 2010-09-22 08:52:52 +0200
# base_revision_id: jorgen.loland@stripped\
#   daqcia4mm8jehsy8
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWcuCxOwAAYHfgEAwUGP//1sV
/AC////0UAOS3ldnt3qQ63vcJKIaEeqHqNpiaaQ9NQ9I0GhoHpAaCUSZQZT9Jhopk0yHqAyGhkNA
9R+qAlCaJT0wmU9Jk2pkaaA00AAGgA01JH6UepkANABoGgAAAAJJJoDQCZCJ7UxMJNHqeoPUAaPU
9RgaPy2r62Gta/6EEmdOBgcxlqsfwqb1CQxxr2ZlVTD5l7cKnG173K7y2pcS6Zm7/3bi5nU3qhn7
eVlkKc+OpGKhmsgYcUEhuEbqxPMt4qmkWE+FVWBLO/Ep0h6RMyWC5xM68Jg33ENKIUjwS5UWF8RM
ZM6ISiQBk1u1BayyeCjZTaDDVSEkT+cAoI2sovczqrvypyIXpDTebzfNo1bi9Pox7OM01swjOLAR
HREwOkcsGvapgwlZfkkVUY6FGn5IYoOEzw3KxLbdrAqjRklkDJAB+/ulBo5CyUgObN/SoXXEIWCt
yimE15PiagbG0kohElbpKiScSGmizJkpQUnKK+KImIrRvJ30yL0jx6pwIudbLEuLSF8FLSwdUisc
lUboDAySWSNOuB8JpDQJNyhWFpNTF3rEGVTMMZaiojYQvlQsVgr7rz5klA+QVKFTIDQFadmkQ5xG
6COFGKLG+riCogUmUU3xJPxkkqalvPgY115EvTcka7FWfUobNdyOMHcPWxtxyDT5eO4/0FxHnTn0
SHkL73hVdRFeCsDnSi5a4oWMItfjs9DU4upMnVdqDEqDvlH+SZsPOrNtCNrAUqRV8yClb415WTlE
qjTOTJG/EI9g2RcYTcXkmptDQTC2QTTS4rsdyl1stLLmvkDppIEzNDpmZBtpLwrcljrZkwaaE8Fe
b0xUUTuy12VEiGzRqGcz8PXnseOMAHLApOFnXx87Z7ojgOsN6HYAqSv17dg2kKHi+5AMi1WqKYKS
rbxTSa9Z4Di5PMDiZgrfT104R4hAKWKYuPATjgGIs10A+p9hnV6DzFZrJwfkcikKwtmFED1pBdxL
MkMRrXn28kiE4iAN3qW+gVHNrVwkQDonOEy6x8T2lEBDCYGhgBRA8ryG/KxkyI2Wccq7MZfA7YJG
gFMHskK+yRuDpQkVLwHrfPNxqiljFAbFFzWl+O2OSPVoB6I2uzpyS7YUZZdMxIEm41ZKdeKNUpIZ
iOF5JQUq2YF/iZNFRq1LPlZign4EMoQWmWNSOc1pQlTKIFzd2N904rgmBipbtJWGrR6tk/lOjPwG
CYtE74EHBWpw2mC24SksCg7X/8XckU4UJDLgsTsA


--===============6326042630689800793==--