database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge 10.4 into 10.5

Browse Source
This commit is contained in:
Marko Mäkelä
2021-03-31 11:05:21 +03:00
parent bf310b4cfb 8341f582b2
commit 5eae8c2742
37 changed files with 881 additions and 942 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_test.cc
View File

@ -620,7 +620,7 @@ Next alarm time: %lu\n",
#if defined(HAVE_MALLINFO2)
struct mallinfo2 info = mallinfo2();
#elif defined(HAVE_MALLINFO)
struct mallinfo info= mallinfo();
struct mallinfo info= mallinfo();
#endif
#if defined(HAVE_MALLINFO) || defined(HAVE_MALLINFO2)
char llbuff[10][22];