Commit 07a887b3 authored by unknown's avatar unknown

Portability fixes


libmysql/libmysql.c:
  Remove duplicated define
sql/log_event.cc:
  Portability fix
parent fec70ce4
......@@ -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>
......
......@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment