diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2022-08-10 12:24:31 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2022-08-10 12:24:31 +0200 |
| commit | 1ac0bce36e5bf2136cedb1ce1da949f53cce4404 (patch) | |
| tree | 7b81481b201c4e64aaa4a70411d992e0fac2289d /sql/sql_cache.cc | |
| parent | 3b071bad1981a12e76769cbfc31b62fbd7362372 (diff) | |
| parent | 65e8506ca9d03967191b6ed207cf107d311f7f99 (diff) | |
| download | mariadb-git-1ac0bce36e5bf2136cedb1ce1da949f53cce4404.tar.gz | |
Merge branch '10.4' into 10.5mariadb-10.5.17
Diffstat (limited to 'sql/sql_cache.cc')
| -rw-r--r-- | sql/sql_cache.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_cache.cc b/sql/sql_cache.cc index 164b8b0cbb0..9968f2d4ff8 100644 --- a/sql/sql_cache.cc +++ b/sql/sql_cache.cc @@ -1205,7 +1205,7 @@ void Query_cache::end_of_result(THD *thd) BLOCK_LOCK_WR(query_block); Query_cache_query *header= query_block->query(); Query_cache_block *last_result_block; - size_t allign_size; + size_t align_size; size_t len; if (header->result() == 0) @@ -1223,8 +1223,8 @@ void Query_cache::end_of_result(THD *thd) DBUG_VOID_RETURN; } last_result_block= header->result()->prev; - allign_size= ALIGN_SIZE(last_result_block->used); - len= MY_MAX(query_cache.min_allocation_unit, allign_size); + align_size= ALIGN_SIZE(last_result_block->used); + len= MY_MAX(query_cache.min_allocation_unit, align_size); if (last_result_block->length >= query_cache.min_allocation_unit + len) query_cache.split_block(last_result_block,len); |