diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2022-08-10 13:06:08 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2022-08-10 13:06:08 +0200 |
| commit | c442e1ae21edc1f63906ac6101f1e989b589846f (patch) | |
| tree | c98e223d5236f0e189104121fa96c591b05f1bd6 /sql/sql_cache.cc | |
| parent | 4f54c219e7c73072d7eff1e81e0f51dc1ff47509 (diff) | |
| parent | 1ac0bce36e5bf2136cedb1ce1da949f53cce4404 (diff) | |
| download | mariadb-git-c442e1ae21edc1f63906ac6101f1e989b589846f.tar.gz | |
Merge branch '10.5' into 10.6
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 646544c12fe..56a443bacc4 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); |