1
0
mirror of https://github.com/MariaDB/server.git synced 2025-10-12 12:25:37 +03:00

MDEV-16188 Post merge fixes:fixed warnings on Windows

Also adjusted some result files after Galina's last patch for ANALYZE.
This commit is contained in:
Igor Babaev
2019-02-06 15:56:21 -08:00
parent 447e0f023f
commit 9e114455a9
18 changed files with 465 additions and 34 deletions

View File

@@ -2826,7 +2826,7 @@ double handler::keyread_time(uint index, uint ranges, ha_rows rows)
size_t len= table->key_info[index].key_length + ref_length;
if (index == table->s->primary_key && table->file->primary_key_is_clustered())
len= table->s->stored_rec_length;
uint keys_per_block= (stats.block_size/2.0/len+1);
uint keys_per_block= (uint) (stats.block_size/2.0/len+1);
ulonglong blocks= !rows ? 0 : (rows-1) / keys_per_block + 1;
double cost= (double)rows*len/(stats.block_size+1)*IDX_BLOCK_COPY_COST;
if (ranges)