From: Jorgen Loland
Date: September 15 2010 8:53am
Subject: bzr commit into mysql-next-mr-bugfixing branch (jorgen.loland:3243) Bug#49129
List-Archive: http://lists.mysql.com/commits/118281
X-Bug: 49129
Message-Id: <20100915085312.2858013BC@atum21.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6422937143164873599=="

--===============6422937143164873599==
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:epotemkin@stripped

 3243 Jorgen Loland	2010-09-15
      BUG#49129 - Followup patch to remove compile warning 
      about comparing signed and unsigned int

    modified:
      sql/sql_select.cc
=== modified file 'sql/sql_select.cc'
--- a/sql/sql_select.cc	2010-09-10 05:14:00 +0000
+++ b/sql/sql_select.cc	2010-09-15 08:53:08 +0000
@@ -1278,8 +1278,8 @@ bool might_do_join_buffering(uint join_c
   */
   return (sj_tab-sj_tab->join->join_tab != sj_tab->join->const_tables && // (1)
           sj_tab->use_quick != QS_DYNAMIC_RANGE && 
-          ((join_cache_level != 0 && sj_tab->type == JT_ALL) ||
-           (join_cache_level > 4 && 
+          ((join_cache_level != 0U && sj_tab->type == JT_ALL) ||
+           (join_cache_level > 4U && 
             (sj_tab->type == JT_REF || 
              sj_tab->type == JT_EQ_REF || 
              sj_tab->type == JT_CONST))));


--===============6422937143164873599==
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\
#   lygr5tud7qmeut4u
# target_branch: file:///export/home/jl208045/mysql/mysql-next-mr-opt-\
#   backporting-review1/
# testament_sha1: b80a7e1e8431885b8c1b7298e81f7b3b9ffbfa8c
# timestamp: 2010-09-15 10:53:12 +0200
# base_revision_id: epotemkin@stripped\
#   daujiy9yd7l1ck1y
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWQ1McB0AAX9fgAGQeWP/93OU
BgC////0UAPDGp7dXrvJ73s97hogjQ0ENNMJppqYDQmTE0MjEEooyI2jTU0wRM0jJk0BoABoBJET
TFMhlI3okeo/UnoGo0aep6gaNNAZKhp4oyNPUbUeoAAAaAAAEkoTaDRT0nlNk1PU2oeo0aANADQE
iKlB9NfYUT4fTwnwOQRACpiJ31JUsS8EAKHS4Qsm3tMzHXNzHdbDEajwTrQv45R5YGra4OvlQk7n
2sQJ6ED7dfrq1200zW5ZiQZDlGHxmPVoZ0U0dgQyR49JZxYl8Ebk9dWSrxNhSioHrS0JYNSG22wW
+j7/kRSLDsSJEF0+DnSo+GNYigKVgiBEJLRXGdpYM0pIrz2AqsYl157nhNSvJze7DkP4p5LtrfAU
9S+fRE95zXA11Vovx84DetMtM6l9AhrISSVRXmIgiW5q4wuLx8ypaIwiyMaMVGeGVDU9ppx3R1ls
mWpg253S2nGQ56bIbjyvFWIjVy6QcJPjWm4uUusIMM9fEsEe6CPWPJjIPmVKBeO3kGHLwtSt+4dT
nTZTJSlWESBAZCahwmKrGXZiUa0YGjSjkIRlPK99X9SSPJ6GQRmjgviHhVQTXDc6kPoe9p1YLaNJ
sGGkyaxokwla3I5/txpnr4ZJ7ejqjdpdAdIvDITIxs7pe+jVx7p/sU+TxGUrSLbqtJQuSA9bv9jG
Q9X66Zdxx7u9Ketw78aQxyZLVUX0zHbWspEubkI7b+4sTtkwCy2CvfnEnMjs4oFFNURbCQgAMIhH
UOAwlaFF7at6ISxNCzI5ZhLQYFFCYBK8vhM0YbIdfFMQcU+coISNiF9L1mjNSoZEPuAahjOVRYmm
tkMJp6Thy8KKcm1fUBiqA6awGJUy5QxujdfheBaSohzuWawxuIboxi6ywXSOH8dnPLTEWESUGxCo
CYdqEhkMBbQUd0lKWpROP1b0VujQTkRC1RpXANooPnokk976nUBQGDGxQ6poDJTG08hp36UPsGC0
IcDSeomDWqQqhCJXAXjiRJjMpTHQ6vsSnOIUSRenVz6RNhu0hP2vOExqVh5hW2TJMOJt01AGS7SM
4gRk5I9YYpFIUQuEw0rkbLo41ifrwSwDTvWGyEwgc2kURWBRGBf23pNsyZSopMySgxc9WniLoagI
FvsuaQOsU8M51WYqJHNhJGy/fEkBPqtgtT8b7NNtqMyzCMlcXs912YQh1UXZI4cGr6kO5cXIx2Y0
/2KeIrHiQqZGzKEKjDCVux4uqVwTJQrVS7eJ38EIyTNARj0yf30VWiu46iKIgTbBgpGlyI4QrWdc
xtXirxWa0PSsD8QqHqP/F3JFOFCQDUxwHQ==


--===============6422937143164873599==--