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

Merge sita.local:/Users/tsmith/m/bk/50

Browse Source 
into  sita.local:/Users/tsmith/m/bk/maint/50
This commit is contained in:
tsmith@sita.local
2007-09-24 11:33:27 +02:00
parent 4ffcc4f266 d8fd59a423
commit 5aba321046
37 changed files with 341 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/sql_select.cc
View File

@ -13066,7 +13066,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;
@ -13182,7 +13183,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;
/*
@ -13228,7 +13229,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;
}