Commit 30bb7b51 authored by serg@serg.mysql.com's avatar serg@serg.mysql.com
Browse files

Merge work:/home/bk/mysql into serg.mysql.com:/usr/home/serg/Abk/mysql

parents 22920434 8e4246ca

BitKeeper/etc/logging_ok

+3 −2
Original line number Diff line number Diff line 
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

sql/mysqld.cc

+4 −5
Original line number Diff line number Diff line
@@ -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

  */