1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge 10.3 into 10.4

Browse Source
This commit is contained in:
Marko Mäkelä 2020-07-04 22:11:16 +03:00
commit b99fa1e767
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
storage/innobase/buf/buf0buf.cc
View File

@ -1622,7 +1622,7 @@ buf_chunk_init(
return(NULL); return(NULL);
} }
MEM_MAKE_ADDRESSABLE(chunk->mem, chunk->mem_size()); MEM_MAKE_ADDRESSABLE(chunk->mem, chunk->mem_size());
#ifdef HAVE_LIBNUMA #ifdef HAVE_LIBNUMA
if (srv_numa_interleave) { if (srv_numa_interleave) {
@ -2890,8 +2890,21 @@ withdraw_retry:
while (chunk < echunk) { while (chunk < echunk) {
buf_block_t* block = chunk->blocks; buf_block_t* block = chunk->blocks;
MEM_MAKE_ADDRESSABLE(chunk->mem, /* buf_LRU_block_free_non_file_page()
chunk->mem_size()); invokes MEM_NOACCESS() on any blocks
that are in free_list. We must
cancel the effect of that. In MemorySanitizer,
MEM_NOACCESS() is no-op, so we must not do
anything special for it here. */
#ifdef HAVE_valgrind
# if !__has_feature(memory_sanitizer)
MEM_MAKE_DEFINED(chunk->mem,
chunk->mem_size());
# endif
#else
MEM_MAKE_ADDRESSABLE(chunk->mem,
chunk->mem_size());
#endif
for (ulint j = chunk->size; for (ulint j = chunk->size;
j--; block++) { j--; block++) {