diff options
| author | monty@hundin.mysql.fi <> | 2001-12-27 13:31:10 +0200 |
|---|---|---|
| committer | monty@hundin.mysql.fi <> | 2001-12-27 13:31:10 +0200 |
| commit | ac8155cce1e015494773bf9e4da469233dddb7f2 (patch) | |
| tree | 15d6d78833b455cbaaf22190cc8c7e0a2ca0b990 | |
| parent | 14e07aabdaeb4251698e0b4ffa3fbb52b1fcdc31 (diff) | |
| download | mariadb-git-ac8155cce1e015494773bf9e4da469233dddb7f2.tar.gz | |
Portability fixes
| -rw-r--r-- | include/global.h | 5 | ||||
| -rw-r--r-- | sql/mysqld.cc | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/include/global.h b/include/global.h index c7d6952f1c6..857c66d3640 100644 --- a/include/global.h +++ b/include/global.h @@ -211,6 +211,11 @@ #ifdef DONT_USE_FINITE /* HPUX 11.x has is_finite() */ #undef HAVE_FINITE #endif +#if defined(HPUX) && defined(_LARGEFILE64_SOURCE) && defined(THREAD) +/* Fix bug in setrlimit */ +#undef setrlimit +#define setrlimit cma_setrlimit64 +#endif /* We can not live without these */ diff --git a/sql/mysqld.cc b/sql/mysqld.cc index ac1bb3f04be..be20c5fa964 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -377,6 +377,7 @@ static void get_options(int argc,char **argv); static char *get_relative_path(const char *path); static void fix_paths(void); static pthread_handler_decl(handle_connections_sockets,arg); +static pthread_handler_decl(kill_server_thread,arg); static int bootstrap(FILE *file); static bool read_init_file(char *file_name); #ifdef __NT__ |