Commit 76d3e3bc authored by Arun Kuruvila's avatar Arun Kuruvila

Bug#18463911 : SERVER CRASHES ON CREATING A TEMP TABLE WITH

               CERTAIN MAX_HEAP_TABLE_SIZE VALUES

Followup patch to fix failure on Window machine.
parent cdf72d51
......@@ -75,7 +75,7 @@ int hp_get_new_block(HP_BLOCK *block, size_t *alloc_length)
This doesn't add much overhead - with current values of sizeof(HP_PTRS)
and my_default_record_cache_size we get about 1/128 unused memory.
*/
*alloc_length= sizeof(HP_PTRS)* i + (ulong) block->records_in_block *
*alloc_length= sizeof(HP_PTRS)* i + (ulonglong) block->records_in_block *
block->recbuffer;
if (!(root=(HP_PTRS*) my_malloc(*alloc_length,MYF(MY_WME))))
return 1;
......
......@@ -240,7 +240,7 @@ static void init_block(HP_BLOCK *block, uint reclength, ulong min_records,
records_in_block= max_records / 10;
if (records_in_block < 10 && max_records)
records_in_block= 10;
if (!records_in_block || (ulong) records_in_block * recbuffer >
if (!records_in_block || (ulonglong) records_in_block * recbuffer >
(my_default_record_cache_size-sizeof(HP_PTRS)*HP_MAX_LEVELS))
records_in_block= (my_default_record_cache_size - sizeof(HP_PTRS) *
HP_MAX_LEVELS) / recbuffer + 1;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment