Commit 9ad2cd8c authored by monty@work.mysql.com's avatar monty@work.mysql.com
Browse files

Portability fixes

parent 6fac59e5

libmysql/libmysql.c

+0 −1
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
   Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,

   MA 02111-1307, USA */



#define DONT_USE_RAID

#include <global.h>

#if defined(__WIN__) || defined(_WIN32) || defined(_WIN64)

#include <winsock.h>

sql/log_event.cc

+1 −1
Original line number Diff line number Diff line
@@ -278,7 +278,7 @@ void Log_event::print_timestamp(FILE* file, time_t* ts) 
    ts = &when;

  }

#ifdef MYSQL_SERVER

  res=localtime_r(ts,&tm_tmp);

  localtime_r(ts,(res= &tm_tmp));

#else

  res=localtime(ts);

#endif