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 branch '11.3' into 11.4

Browse Source
This commit is contained in:
Oleksandr Byelkin
2024-02-15 13:53:21 +01:00
parent 3ae6680eec 068a6819eb
commit fa69b085b1
400 changed files with 10554 additions and 2525 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
sql/sql_test.cc
View File

@@ -28,14 +28,17 @@
#include <hash.h>
#include "sql_connect.h"
#include "thread_cache.h"
#if defined(HAVE_MALLINFO) || defined(HAVE_MALLINFO2)
#if defined(HAVE_MALLOC_H)
#include <malloc.h>
#elif defined(HAVE_SYS_MALLOC_H)
#include <sys/malloc.h>
#elif defined(HAVE_MALLOC_ZONE)
#include <malloc/malloc.h>
#endif
#if defined(HAVE_SYS_MALLOC_H)
#include <sys/malloc.h>
#endif
#if defined(HAVE_MALLOC_ZONE)
#include <malloc/malloc.h>
#endif
#ifdef HAVE_EVENT_SCHEDULER