summaryrefslogtreecommitdiff
path: root/sql/mysqld.cc
diff options
context:
space:
mode:
authorAlexey Kopytov <Alexey.Kopytov@sun.com>2009-02-25 10:49:02 +0200
committerAlexey Kopytov <Alexey.Kopytov@sun.com>2009-02-25 10:49:02 +0200
commitcfa529fc3f8cac722545d37d67f7fa20888ee16b (patch)
tree6c81264bace53c05fcf83ff3248918edf6eb714e /sql/mysqld.cc
parent19ee83f02e2948252be6fb3701c7d19393f121a5 (diff)
parent318f23c712737586d55fce4dfa6042c9808e7cb3 (diff)
downloadmariadb-git-cfa529fc3f8cac722545d37d67f7fa20888ee16b.tar.gz
Automerge.
Diffstat (limited to 'sql/mysqld.cc')
-rw-r--r--sql/mysqld.cc3
1 files changed, 0 insertions, 3 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 7f78b410b05..bd1afc7f0ca 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -178,9 +178,6 @@ int initgroups(const char *,unsigned int);
typedef fp_except fp_except_t;
#endif
#endif /* __FreeBSD__ && HAVE_IEEEFP_H */
-#ifdef HAVE_FENV_H
-#include <fenv.h>
-#endif
#ifdef HAVE_SYS_FPU_H
/* for IRIX to use set_fpc_csr() */
#include <sys/fpu.h>