From: Jorgen Loland
Date: September 21 2010 12:38pm
Subject: bzr commit into mysql-next-mr-bugfixing branch (jorgen.loland:3245) Bug#49129
List-Archive: http://lists.mysql.com/commits/118714
X-Bug: 49129
Message-Id: <20100921123853.B8E4572A@atum21.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2038098649463803108=="

--===============2038098649463803108==
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:roy.lyseng@stripped

 3245 Jorgen Loland	2010-09-21
      BUG#49129 - followup patch. Fix 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-20 14:06:02 +0000
+++ b/sql/sql_select.cc	2010-09-21 12:38:49 +0000
@@ -1276,13 +1276,13 @@ bool might_do_join_buffering(uint join_c
   /* 
      (1) sj_tab is not a const table
   */
-  return (sj_tab-sj_tab->join->join_tab != sj_tab->join->const_tables && // (1)
+  int sj_tabno= sj_tab - sj_tab->join->join_tab;
+  return (sj_tabno >= (int)sj_tab->join->const_tables && // (1)
           sj_tab->use_quick != QS_DYNAMIC_RANGE && 
-          ((join_cache_level != 0U && sj_tab->type == JT_ALL) ||
-           (join_cache_level > 4U && 
+          ((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_CONST))));
+             sj_tab->type == JT_EQ_REF))));
 }
 
 /**


--===============2038098649463803108==
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\
#   daqcia4mm8jehsy8
# target_branch: file:///export/home/jl208045/mysql/mysql-next-mr-opt-\
#   backporting-review1/
# testament_sha1: 0e244223121840cfb286d330d1488fbff4f63d7e
# timestamp: 2010-09-21 14:38:53 +0200
# base_revision_id: roy.lyseng@stripped\
#   qes7y17dnehk97rn
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWdUtUEkAAbVfgEGweWP//3OU
NgC////0UAQaJvWpwOBquBJJAmI0yo9GZMRPQk0eU2ob1PVPUaaeU9TQJRTJJtpim1J5TNEYhoHp
A0AAA0EkRPRCp5qnqfpiTUZMho9T1A00ANAaBzCYBMAJhMJpgAAEyaaBhJJBoNASbQp+RoKHqfqQ
ANAAMl8LTllLvy+lh6m36f7c9XV0XYCJkO86vLfC29Timj5wfuuvZJ6Xe/Jph8o2Zgi5K5/m0rEr
djbYhp9MToOzAzV7qCflPF3+ntLW2fo3N9xJjjqxwEftdHTZZpz3PzJzIvmUa+DLh8XZLY8HjzzQ
k50Ea7aBmIdoDzh/nZnCu3TzIapZF3JDdxKocNhKVmU0zCzbrLZCMEi8dOHpBnLJcTgEccxxEyYU
XupWJ3q2jjMubpgFaxyGnkwEcDG0iORL9VFUsOFofKeQ4jzQztMQanvM9wy8PxlOHe41jzG8MaRG
AVsKJ/i27jC4TElz40DcdUQWrGu8QWVJOOy5G89LmCTiKZKsFcZRKhJKJGpongyZkZx2nbkK1bcC
C3mCsWmzHYPJjHrJzuCmp5VplJYErxGE6mi0iOv5qIQU18Y9tqLm36sck3twgVhhDaaBXxDZjkNr
yza+QxQTqNTFU767ZHAURgLElKWYh9zkrjnC8rWGh4Zu8+ODWNew02TRgD2GIIsTYZrzRfyvLOGW
nfSnRlvBx4Vsj5hEl1xTsmN/q90gek6sQ383oIehu6nXMu2ZL5cPBPn9RC5w+GzX4i8P9Eg93isI
sEiIy77yiAMc+N6ixkrReUwvvsHNTDA3e4Jh3HaP0bsdL4bMotClINH1dxuL15y001PGAmcwKFIy
6vpgawkYanNroKMlXcYlEqnPkCclUKWhVGoqJQxcXy1Ck0na4kvNW27LMWOlhDcnKS5mqtzvs9hl
M5IHUTeB3V8Gy5OOKvAYNCZMs9uEmWHjDPEnjGRFdMpMDhZkVnYauvAkJSBb39PK+1y5jkpjejUB
QU1cjMbaDFE4dowq0bE6QVJVx0TS79hAcWKMv8iLQrphLL9WbC98AgGTH2i4MlkLmUDfE7hqYbDQ
KszcEe8xOgwWBa4IluAxJXpDEi5TnHZN6e1KAwRCLBNkn6oEmfQT+j3PJubnT2sSOSYcM2dE4MlY
vMNtCLYCoPZiUfZ0lalWYGZaDru+O9p9EfDBKXchTBo55d4JHUPfSlOsyNXa6qA7Lr1u5GZSdjqL
efoOOu6ltN3KLINSKypvVElsmjCt3RIlAfzfEoVesI/Vg+yAUUIbEYJbnPWsHq2KyzeETPdTZqme
mm+XXLTCaYjOsUMolmKcsX9sSadWFlaArWVSM/xPj0YBaApCZUtl0ExLFwR1uqhc8eKi8ooUi0aD
ag0MAwFaFImkeVhprcOgWGyP+LuSKcKEhqlqgkg=


--===============2038098649463803108==--