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

Merge with 4.0

Browse Source
This commit is contained in:
monty@narttu.mysql.fi
2003-11-04 09:40:36 +02:00
parent 30af2d0f49 e1e82a4e00
commit 4e4725377d
67 changed files with 882 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_test.cc
View File

@@ -22,7 +22,11 @@
#include "sql_select.h"
#include <hash.h>
#include <thr_alarm.h>
#if defined(HAVE_MALLINFO) && defined(HAVE_MALLOC_H)
#include <malloc.h>
#elif defined(HAVE_MALLINFO) && defined(HAVE_SYS_MALLOC_H)
#include <sys/malloc.h>
#endif
/* Intern key cache variables */
extern "C" pthread_mutex_t THR_LOCK_keycache;