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

Merge 10.5 into 10.6

Browse Source
This commit is contained in:
Marko Mäkelä
2024-10-03 09:31:39 +03:00
parent cc70ca7eab 170e4555e2
commit 7e0afb1c73
482 changed files with 4427 additions and 623 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
storage/perfschema/unittest/stub_print_error.h
View File

@@ -23,21 +23,23 @@
#include <my_global.h>
#include <my_sys.h>
#include <pfs_global.h>
#include "aligned.h"
#include "assume_aligned.h"
bool pfs_initialized= false;
void *pfs_malloc(PFS_builtin_memory_class *klass, size_t size, myf flags)
{
void *ptr= malloc(size);
size= MY_ALIGN(size, CPU_LEVEL1_DCACHE_LINESIZE);
void *ptr= aligned_malloc(size, CPU_LEVEL1_DCACHE_LINESIZE);
if (ptr && (flags & MY_ZEROFILL))
memset(ptr, 0, size);
memset_aligned<CPU_LEVEL1_DCACHE_LINESIZE>(ptr, 0, size);
return ptr;
}
void pfs_free(PFS_builtin_memory_class *, size_t, void *ptr)
{
if (ptr != NULL)
free(ptr);
aligned_free(ptr);
}
void *pfs_malloc_array(PFS_builtin_memory_class *klass, size_t n, size_t size, myf flags)