bzr commit into mysql-next-mr-bugfixing branch (jorgen.loland:3245) Bug#49129

[Jorgen Loland]

#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))));
 }
 
 /**


Attachment: [text/bzr-bundle] bzr/[e-mail]