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 remote-tracking branch 10.5 into 10.6

Browse Source 
Notably MDEV-33290, columnstore disable stays in 10.5.
This commit is contained in:
Daniel Black
2024-01-23 15:25:42 +11:00
parent 19f3796ec3 5ce6a352b6
commit 4ef9c9bb75
5 changed files with 76 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
sql/sql_test.cc
View File

@@ -29,14 +29,17 @@
#include <thr_alarm.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