diff options
| -rw-r--r-- | libmysql/libmysql.c | 1 | ||||
| -rw-r--r-- | sql/log_event.cc | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index 469331641c8..0cb6170b25c 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -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> diff --git a/sql/log_event.cc b/sql/log_event.cc index 869167bba2f..521e0f7765f 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -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 |