database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Merge 10.6 into 10.7

Browse Source
This commit is contained in:
Marko Mäkelä
2023-01-10 13:58:03 +02:00
parent 8356fb68c3 56c9b0bca0
commit ab36eac584
23 changed files with 186 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysys/my_alloc.c
View File

@@ -120,8 +120,8 @@ static void calculate_block_sizes(MEM_ROOT *mem_root, size_t block_size,
SYNOPSIS
init_alloc_root()
key - key to register instrumented memory
mem_root - memory root to initialize
name - name of memroot (for debugging)
block_size - size of chunks (blocks) used for memory allocation.
Will be updated to next power of 2, minus
internal and system memory management size. This is