bk commit into 5.1 tree (kaa:1.2435)

[Alexey Kopytov]

Below is the list of changes that have just been committed into a local
5.1 repository of kaa. When kaa does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-06-30 13:36:40+04:00, kaa@stripped +1 -0
  Merge polly.local:/home/kaa/src/maint/bug5731/my50-bug5731
  into  polly.local:/home/kaa/src/maint/bug5731/my51-bug5731
  MERGE: 1.1810.2566.4

  sql/sql_select.cc@stripped, 2007-06-30 13:36:35+04:00, kaa@stripped +0 -0
    Auto merged
    MERGE: 1.312.128.1

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	kaa
# Host:	polly.local
# Root:	/home/kaa/src/maint/bug5731/my51-bug5731/RESYNC

--- 1.491/sql/sql_select.cc	2007-02-14 03:09:34 +03:00
+++ 1.492/sql/sql_select.cc	2007-06-30 13:36:35 +04:00
@@ -13025,7 +13025,8 @@ static int
 join_init_cache(THD *thd,JOIN_TAB *tables,uint table_count)
 {
   reg1 uint i;
-  uint length,blobs,size;
+  uint length, blobs;
+  size_t size;
   CACHE_FIELD *copy,**blob_ptr;
   JOIN_CACHE  *cache;
   JOIN_TAB *join_tab;
@@ -13141,7 +13142,7 @@ store_record_in_cache(JOIN_CACHE *cache)
   length=cache->length;
   if (cache->blobs)
     length+=used_blob_length(cache->blob_ptr);
-  if ((last_record=(length+cache->length > (uint) (cache->end - pos))))
+  if ((last_record= (length + cache->length > (size_t) (cache->end - pos))))
     cache->ptr_record=cache->records;
 
   /*
@@ -13187,7 +13188,7 @@ store_record_in_cache(JOIN_CACHE *cache)
     }
   }
   cache->pos=pos;
-  return last_record || (uint) (cache->end -pos) < cache->length;
+  return last_record || (size_t) (cache->end - pos) < cache->length;
 }