Bug #18808072 MYSQLBINLOG USES LOCALTIME() TO PRINT EVENTS,

CAUSES KERNEL MUTEX CONTENTION
Merging fix from mysql-5.5

Author: Venkatesh Duggirala

client/mysqlbinlog.cc

@@ -2917,16 +2917,17 @@ int main(int argc, char** argv)
   DBUG_PROCESS(argv[0]);
 
   my_init_time(); // for time functions
-   /*
+  tzset(); // set tzname
+  /*
     A pointer of type Log_event can point to
      INTVAR
      USER_VAR
      RANDOM
-    events,  when we allocate a element of sizeof(Log_event*) 
+    events,  when we allocate a element of sizeof(Log_event*)
     for the DYNAMIC_ARRAY.
   */
 
-  if((my_init_dynamic_array(&buff_ev, sizeof(buff_event_info), 
+  if((my_init_dynamic_array(&buff_ev, sizeof(buff_event_info),
                             INTVAR_DYNAMIC_INIT, INTVAR_DYNAMIC_INCR)))
     exit(1);
 

cmake/os/WindowsCache.cmake

@@ -1,4 +1,4 @@
-# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -88,7 +88,7 @@ SET(HAVE_GETRLIMIT CACHE  INTERNAL "")
 SET(HAVE_GETRUSAGE CACHE  INTERNAL "")
 SET(HAVE_GETTIMEOFDAY CACHE  INTERNAL "")
 SET(HAVE_GETWD CACHE  INTERNAL "")
-SET(HAVE_GMTIME_R CACHE  INTERNAL "")
+SET(HAVE_GMTIME_R 1 CACHE  INTERNAL "")
 SET(HAVE_GRP_H CACHE  INTERNAL "")
 SET(HAVE_IA64INTRIN_H CACHE  INTERNAL "")
 SET(HAVE_IEEEFP_H CACHE  INTERNAL "")
@@ -111,7 +111,7 @@ SET(HAVE_LANGINFO_H CACHE  INTERNAL "")
 SET(HAVE_LDIV 1 CACHE  INTERNAL "")
 SET(HAVE_LIMITS_H 1 CACHE  INTERNAL "")
 SET(HAVE_LOCALE_H 1 CACHE  INTERNAL "")
-SET(HAVE_LOCALTIME_R CACHE  INTERNAL "")
+SET(HAVE_LOCALTIME_R 1 CACHE  INTERNAL "")
 SET(HAVE_LOG2 CACHE  INTERNAL "")
 SET(HAVE_LONGJMP 1 CACHE  INTERNAL "")
 SET(HAVE_LRAND48 CACHE  INTERNAL "")

include/my_pthread.h

@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -144,8 +144,18 @@ int pthread_attr_init(pthread_attr_t *connect_att);
 int pthread_attr_setstacksize(pthread_attr_t *connect_att,DWORD stack);
 int pthread_attr_destroy(pthread_attr_t *connect_att);
 int my_pthread_once(my_pthread_once_t *once_control,void (*init_routine)(void));
-struct tm *localtime_r(const time_t *timep,struct tm *tmp);
-struct tm *gmtime_r(const time_t *timep,struct tm *tmp);
+
+static inline struct tm *localtime_r(const time_t *timep, struct tm *tmp)
+{
+  localtime_s(tmp, timep);
+  return tmp;
+}
+
+static inline struct tm *gmtime_r(const time_t *clock, struct tm *res)
+{
+  gmtime_s(res, clock);
+  return res;
+}
 
 void pthread_exit(void *a);
 int pthread_join(pthread_t thread, void **value_ptr);

mysys/my_wincond.c

@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -344,26 +344,4 @@ int pthread_attr_destroy(pthread_attr_t *connect_att)
   return 0;
 }
 
-/****************************************************************************
-** Fix localtime_r() to be a bit safer
-****************************************************************************/
-
-struct tm *localtime_r(const time_t *timep,struct tm *tmp)
-{
-  if (*timep == (time_t) -1)			/* This will crash win32 */
-  {
-    memset(tmp, 0, sizeof(*tmp));
-  }
-  else
-  {
-    struct tm *res=localtime(timep);
-    if (!res)                                   /* Wrong date */
-    {
-      memset(tmp, 0, sizeof(*tmp));             /* Keep things safe */
-      return 0;
-    }
-    *tmp= *res;
-  }
-  return tmp;
-}
 #endif /* __WIN__ */

sql/log_event.cc

@@ -2591,13 +2591,8 @@ void Log_event::print_timestamp(IO_CACHE* file, time_t *ts)
   */
   time_t ts_tmp= ts ? *ts : (ulong)when.tv_sec;
   DBUG_ENTER("Log_event::print_timestamp");
-#ifdef MYSQL_SERVER				// This is always false
   struct tm tm_tmp;
   localtime_r(&ts_tmp, (res= &tm_tmp));
-#else
-  res= localtime(&ts_tmp);
-#endif
-
   my_b_printf(file,"%02d%02d%02d %2d:%02d:%02d",
               res->tm_year % 100,
               res->tm_mon+1,