diff options
| author | unknown <serg@serg.mylan> | 2004-02-20 23:42:06 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2004-02-20 23:42:06 +0100 |
| commit | e8ae2f52668280acacfeae2cd78348361bf1c539 (patch) | |
| tree | 5a9e5e65b87b27e63886ec475aa17b69a7aabae9 /mysys | |
| parent | de264ea443fc84e6d99997d0b5d7c18923b36faf (diff) | |
| download | mariadb-git-e8ae2f52668280acacfeae2cd78348361bf1c539.tar.gz | |
fix for --open-files-limit and broken query_cache_merge.test
mysys/my_init.c:
#include moved to mysys_priv.h
mysys/mysys_priv.h:
#include moved to mysys_priv.h
sql/hostname.cc:
removed unnecessary #include
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/my_init.c | 4 | ||||
| -rw-r--r-- | mysys/mysys_priv.h | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/mysys/my_init.c b/mysys/my_init.c index a7899c20442..fc178b0308b 100644 --- a/mysys/my_init.c +++ b/mysys/my_init.c @@ -19,10 +19,6 @@ #include "mysys_err.h" #include <m_string.h> #include <m_ctype.h> -#ifdef HAVE_GETRUSAGE -#include <sys/resource.h> -/* extern int getrusage(int, struct rusage *); */ -#endif #include <signal.h> #ifdef VMS #include <my_static.c> diff --git a/mysys/mysys_priv.h b/mysys/mysys_priv.h index f79431a0b0b..6abadd48aeb 100644 --- a/mysys/mysys_priv.h +++ b/mysys/mysys_priv.h @@ -21,6 +21,10 @@ #include "system_wrappers.h" #endif +#ifdef HAVE_GETRUSAGE +#include <sys/resource.h> +#endif + #ifdef THREAD #include <my_pthread.h> 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 #include <my_no_pthread.h> #endif + |