diff options
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 10f51598c0a..982bf897c43 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -267,6 +267,9 @@ bool opt_large_files= sizeof(my_off_t) > 4; #define GET_HA_ROWS GET_ULONG #endif +#ifdef HAVE_LIBWRAP +char *libwrapName= NULL; +#endif /* Variables to store startup options @@ -1883,14 +1886,13 @@ struct utsname char nodename[FN_REFLEN]; }; + int uname(struct utsname *a) { return -1; } -#endif -#ifdef __WIN__ extern "C" pthread_handler_decl(handle_shutdown,arg) { MSG msg; @@ -1906,7 +1908,7 @@ extern "C" pthread_handler_decl(handle_shutdown,arg) return 0; } -int __stdcall handle_kill(ulong ctrl_type) +int STDCALL handle_kill(ulong ctrl_type) { if (ctrl_type == CTRL_CLOSE_EVENT || ctrl_type == CTRL_SHUTDOWN_EVENT) @@ -1948,10 +1950,6 @@ extern "C" pthread_handler_decl(handle_shutdown,arg) const char *load_default_groups[]= { "mysqld","server",0 }; -#ifdef HAVE_LIBWRAP -char *libwrapName=NULL; -#endif - bool open_log(MYSQL_LOG *log, const char *hostname, const char *opt_name, const char *extension, const char *index_file_name, |