diff options
author | sasha@mysql.sashanet.com <> | 2001-06-04 17:34:11 -0600 |
---|---|---|
committer | sasha@mysql.sashanet.com <> | 2001-06-04 17:34:11 -0600 |
commit | 060da63ab3b830770d5573708766a187d2916811 (patch) | |
tree | 4a4e924d33acb60a72c034f4b7ff58112c07d6dd /sql/mysqld.cc | |
parent | 1d05b8998070a23dd6f49a4885fe09f4cbc1fb8c (diff) | |
parent | f237cdc04145e027365727093a82240e6d162bc0 (diff) | |
download | mariadb-git-060da63ab3b830770d5573708766a187d2916811.tar.gz |
Merge mysql.sashanet.com:/home/sasha/src/bk/mysql
into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0
Diffstat (limited to 'sql/mysqld.cc')
-rw-r--r-- | sql/mysqld.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 41bee098c18..acbb1477a5f 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -95,17 +95,16 @@ int deny_severity = LOG_WARNING; #include <sys/mman.h> #endif +#ifdef _AIX41 +int initgroups(const char *,unsigned 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 */ |