diff options
author | unknown <monty@hundin.mysql.fi> | 2002-08-12 04:04:43 +0300 |
---|---|---|
committer | unknown <monty@hundin.mysql.fi> | 2002-08-12 04:04:43 +0300 |
commit | 23d2203f21f53d2dae7a6ff15589c26a92dc0d51 (patch) | |
tree | 4ba65b7347df0448111dd1a3ab055bc2c8a1c6dc /mysys/my_init.c | |
parent | 92e5f607a7f2512684603a80d19e4808cc546cc5 (diff) | |
parent | 69c6dff7cd1bc3e590324c23638cbb87134d62bb (diff) | |
download | mariadb-git-23d2203f21f53d2dae7a6ff15589c26a92dc0d51.tar.gz |
merge with 3.23.52
BitKeeper/deleted/.del-global.h~e80d28157acfdcb5:
Auto merged
Docs/manual.texi:
Auto merged
include/my_no_pthread.h:
Auto merged
innobase/include/univ.i:
Auto merged
innobase/lock/lock0lock.c:
Auto merged
innobase/os/os0thread.c:
Auto merged
innobase/srv/srv0srv.c:
Auto merged
innobase/trx/trx0trx.c:
Auto merged
innobase/ut/ut0ut.c:
Auto merged
mysql-test/r/bigint.result:
Auto merged
mysql-test/t/bigint.test:
Auto merged
mysys/my_init.c:
Auto merged
mysys/my_net.c:
Auto merged
mysys/mysys_priv.h:
Auto merged
mysys/thr_rwlock.c:
Auto merged
sql/ha_innodb.h:
Auto merged
sql/sql_insert.cc:
Auto merged
include/my_sys.h:
merge with 3.23
libmysql/Makefile.shared:
merge with 3.23
mysql-test/mysql-test-run.sh:
merge with 3.23
mysql-test/r/func_if.result:
merge with 3.23
mysys/Makefile.am:
merge with 3.23
mysys/my_gethostbyname.c:
merge with 3.23
sql/ha_innodb.cc:
merge with 3.23
sql/item_cmpfunc.cc:
merge with 3.23
sql/mysqld.cc:
merge with 3.23
sql/sql_show.cc:
merge with 3.23
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 c4e6132aa9c..f47286159f7 100644 --- a/mysys/my_init.c +++ b/mysys/my_init.c @@ -20,9 +20,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 *); */ |