diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-08-12 03:40:36 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-08-12 03:40:36 +0300 |
| commit | 071994ba3665ce2284de5e77a4f06c0b6e93eeeb (patch) | |
| tree | 5dacc549219b2404fa30afac6d6955e53ef59aea /mysys/my_init.c | |
| parent | 714f2b0f8b90dc843024aea2f3d9afb5becc24d9 (diff) | |
| parent | b2e946136d21ec3102b3204ef1e2a1a10b404ff3 (diff) | |
| download | mariadb-git-071994ba3665ce2284de5e77a4f06c0b6e93eeeb.tar.gz | |
merge
sql/ha_innobase.cc:
merge (kept my changes to ha_innobase.cc to not use sprintf())
Diffstat (limited to 'mysys/my_init.c')
| -rw-r--r-- | mysys/my_init.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/mysys/my_init.c b/mysys/my_init.c index 3bc87fd179d..31e49731c94 100644 --- a/mysys/my_init.c +++ b/mysys/my_init.c @@ -21,9 +21,6 @@ #include "m_ctype.h" #include <m_string.h> #include <m_ctype.h> -#ifdef THREAD -#include <my_pthread.h> -#endif #ifdef HAVE_GETRUSAGE #include <sys/resource.h> /* extern int getrusage(int, struct rusage *); */ |