database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-05 13:16:09 +03:00
Code Activity

fix for --open-files-limit and broken query_cache_merge.test

Browse Source
This commit is contained in:
serg@serg.mylan
2004-02-20 23:42:06 +01:00
parent 49429da988
commit fc16e4ded3
3 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysys/my_init.c
View File

@@ -19,10 +19,6 @@
#include "mysys_err.h" #include "mysys_err.h"
#include <m_string.h> #include <m_string.h>
#include <m_ctype.h> #include <m_ctype.h>
#ifdef HAVE_GETRUSAGE
#include <sys/resource.h>
/* extern int getrusage(int, struct rusage *); */
#endif
#include <signal.h> #include <signal.h>
#ifdef VMS #ifdef VMS
#include <my_static.c> #include <my_static.c>

5
mysys/mysys_priv.h
View File

@@ -21,6 +21,10 @@
#include "system_wrappers.h" #include "system_wrappers.h"
#endif #endif
#ifdef HAVE_GETRUSAGE
#include <sys/resource.h>
#endif
#ifdef THREAD #ifdef THREAD
#include <my_pthread.h> #include <my_pthread.h>
extern pthread_mutex_t THR_LOCK_malloc, THR_LOCK_open, THR_LOCK_keycache; extern pthread_mutex_t THR_LOCK_malloc, THR_LOCK_open, THR_LOCK_keycache;
@@ -29,3 +33,4 @@ extern pthread_mutex_t THR_LOCK_charset;
#else #else
#include <my_no_pthread.h> #include <my_no_pthread.h>
#endif #endif

3
sql/hostname.cc
View File

@@ -27,9 +27,6 @@
extern "C" { // Because of SCO 3.2V4.2 extern "C" { // Because of SCO 3.2V4.2
#endif #endif
#if !defined( __WIN__) && !defined(OS2) #if !defined( __WIN__) && !defined(OS2)
#if !defined(__NETWARE__)
#include <sys/resource.h>
#endif /* __NETWARE__ */
#ifdef HAVE_SYS_UN_H #ifdef HAVE_SYS_UN_H
#include <sys/un.h> #include <sys/un.h>
#endif #endif