diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index 0518f8664e3c5d9e7b97d44da79369e66038e0df..e694ec8328510071161e9a89f039cb67afedaed0 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -1,6 +1,7 @@ +heikki@donna.mysql.fi jani@janikt.pp.saunalahti.fi monty@hundin.mysql.fi mwagner@evoq.mwagner.org -heikki@donna.mysql.fi -sasha@mysql.sashanet.com paul@central.snake.net +sasha@mysql.sashanet.com +serg@serg.mysql.com diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 5f007610a146ab9c0b1aca16ad966ea81ab44de8..3816d1aaa5c97359ab3baf35623a6ae55427f0bd 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -87,17 +87,16 @@ int deny_severity = LOG_WARNING; #include <sys/mman.h> #endif +#ifdef _AIX41 +int initgroups(const char *,int); +#endif + #if defined(__FreeBSD__) && defined(HAVE_IEEEFP_H) #include <ieeefp.h> #ifdef HAVE_FP_EXCEPT // Fix type conflict typedef fp_except fp_except_t; #endif -#ifdef _AIX41 -extern "C" int initgroups(const char *,int); -#endif - - /* We can't handle floating point expections with threads, so disable this on freebsd */