database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

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

Browse Source 
into  damien-katzs-computer.local:/Users/dkatz/mysql50
This commit is contained in:
dkatz@damien-katzs-computer.local
2007-08-03 14:14:15 -04:00
parent 0d9301585b 7c2c8f07e4
commit f64ef11906
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/sql_select.cc
View File

@ -13041,7 +13041,8 @@ static int
join_init_cache(THD *thd,JOIN_TAB *tables,uint table_count) join_init_cache(THD *thd,JOIN_TAB *tables,uint table_count)
{ {
reg1 uint i; reg1 uint i;
uint length,blobs,size; uint length, blobs;
size_t size;
CACHE_FIELD *copy,**blob_ptr; CACHE_FIELD *copy,**blob_ptr;
JOIN_CACHE *cache; JOIN_CACHE *cache;
JOIN_TAB *join_tab; JOIN_TAB *join_tab;
@ -13157,7 +13158,7 @@ store_record_in_cache(JOIN_CACHE *cache)
length=cache->length; length=cache->length;
if (cache->blobs) if (cache->blobs)
length+=used_blob_length(cache->blob_ptr); 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; cache->ptr_record=cache->records;
/* /*
@ -13203,7 +13204,7 @@ store_record_in_cache(JOIN_CACHE *cache)
} }
} }
cache->pos=pos; cache->pos=pos;
return last_record || (uint) (cache->end -pos) < cache->length; return last_record || (size_t) (cache->end - pos) < cache->length;
} }