diff options
| author | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2011-05-10 17:20:26 +0300 |
|---|---|---|
| committer | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2011-05-10 17:20:26 +0300 |
| commit | 712f2d3833a9f5aa35b8171350a4414e709d509c (patch) | |
| tree | dedfe71cc0ebd78c6ac5ec49fb9a366ff76a4bf1 /sql/mysqld.cc | |
| parent | 6ed5d97801c983fea358c8ad95ef2a23d047efc7 (diff) | |
| parent | 2b9c0451f796e3c6a1da78c6d385fe3ddf27e9b9 (diff) | |
| download | mariadb-git-712f2d3833a9f5aa35b8171350a4414e709d509c.tar.gz | |
weave merge of mysql-5.5->mysql-5.5-security
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index a31896bd022..b349c5f91b1 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -245,11 +245,7 @@ inline void setup_fpu() #define MYSQL_KILL_SIGNAL SIGTERM -#ifdef HAVE_GLIBC2_STYLE_GETHOSTBYNAME_R -#include <sys/types.h> -#else #include <my_pthread.h> // For thr_setconcurency() -#endif #ifdef SOLARIS extern "C" int gethostname(char *name, int namelen); |