Commit f672f5dc authored by dkatz@damien-katzs-computer.local's avatar dkatz@damien-katzs-computer.local
Browse files

Merge dkatz@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 

into  damien-katzs-computer.local:/Users/dkatz/mysql50
parents b1fdece3 f64ef119

sql/sql_select.cc

+4 −3
Original line number Diff line number Diff line
@@ -13024,7 +13024,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;
@@ -13140,7 +13141,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;



  /*
@@ -13186,7 +13187,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;

}