Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint

into  polly.local:/home/kaa/src/maint/mysql-5.1-maint

extra/yassl/include/lock.hpp

@@ -28,7 +28,7 @@ namespace yaSSL {
 
 
 #ifdef MULTI_THREADED
-   #if defined(_WIN32) || defined(_WIN64)
+    #ifdef _WIN32
         #include <windows.h>
 
         class Mutex {

extra/yassl/include/openssl/ssl.h

@@ -189,6 +189,7 @@ enum {  /* ERR Constants */
     ERR_TXT_STRING = 1,
     EVP_R_BAD_DECRYPT = 2
 };
+
 /*
   Allow type used by SSL_set_fd to be changed, default to int
   in order to be compatible with OpenSSL

extra/yassl/include/socket_wrapper.hpp

@@ -28,8 +28,9 @@
 
 #include <assert.h>
 
-#include "openssl/ssl.h"                        /* for socket_t */
-#if !defined(_WIN32) && !defined(_WIN64)
+#ifdef _WIN32
+    #include <winsock2.h>
+#else 
     #include <sys/time.h>
     #include <sys/types.h>
     #include <sys/socket.h>

extra/yassl/include/yassl.hpp

@@ -28,7 +28,7 @@
 namespace yaSSL {
 
 
-#if defined(_WIN32) || defined(_WIN64)
+#ifdef _WIN32
     typedef unsigned int SOCKET_T;
 #else
     typedef int          SOCKET_T;

extra/yassl/src/ssl.cpp

@@ -39,7 +39,6 @@
 #include "coding.hpp"           // HexDecoder
 #include "helpers.hpp"          // for placement new hack
 #include <stdio.h>
-#include <assert.h>
 
 #ifdef _WIN32
     #include <windows.h>    // FindFirstFile etc..

extra/yassl/taocrypt/mySTL/algorithm.hpp

@@ -27,8 +27,6 @@
 
 namespace mySTL {
 
-#undef max
-#undef min
 
 template<typename T>
 inline const T& max(const T& a, const T&b)

sql/log.cc

@@ -1714,7 +1714,7 @@ File open_binlog(IO_CACHE *log, const char *log_file_name, const char **errmsg)
 #ifdef __NT__
 static int eventSource = 0;
 
-void setup_windows_event_source()
+static void setup_windows_event_source()
 {
   HKEY    hRegKey= NULL;
   DWORD   dwError= 0;
@@ -4216,7 +4216,7 @@ static bool test_if_number(register const char *str,
 } /* test_if_number */
 
 
-void print_buffer_to_file(enum loglevel level, const char *buffer)
+static void print_buffer_to_file(enum loglevel level, const char *buffer)
 {
   time_t skr;
   struct tm tm_tmp;
@@ -4314,23 +4314,15 @@ void MYSQL_BIN_LOG::signal_update()
 }
 
 #ifdef __NT__
-void print_buffer_to_nt_eventlog(enum loglevel level, char *buff,
-                                 uint length, int buffLen)
+static void print_buffer_to_nt_eventlog(enum loglevel level, char *buff,
+                                        uint length, int buffLen)
 {
   HANDLE event;
-  char   *buffptr;
-  LPCSTR *buffmsgptr;
+  char   *buffptr= buff;
   DBUG_ENTER("print_buffer_to_nt_eventlog");
 
-  buffptr= buff;
-  if (length > (uint)(buffLen-5))
-  {
-    char *newBuff= new char[length + 5];
-    strcpy(newBuff, buff);
-    buffptr= newBuff;
-  }
-  strmov(buffptr+length, "\r\n\r\n");
-  buffmsgptr= (LPCSTR*) &buffptr;               // Keep windows happy
+  /* Add ending CR/LF's to string, overwrite last chars if necessary */
+  strmov(buffptr+min(length, buffLen-5), "\r\n\r\n");
 
   setup_windows_event_source();
   if ((event= RegisterEventSource(NULL,"MySQL")))
@@ -4338,24 +4330,20 @@ void print_buffer_to_nt_eventlog(enum loglevel level, char *buff,
     switch (level) {
       case ERROR_LEVEL:
         ReportEvent(event, EVENTLOG_ERROR_TYPE, 0, MSG_DEFAULT, NULL, 1, 0,
-                    buffmsgptr, NULL);
+                    (LPCSTR*)&buffptr, NULL);
         break;
       case WARNING_LEVEL:
         ReportEvent(event, EVENTLOG_WARNING_TYPE, 0, MSG_DEFAULT, NULL, 1, 0,
-                    buffmsgptr, NULL);
+                    (LPCSTR*) &buffptr, NULL);
         break;
       case INFORMATION_LEVEL:
         ReportEvent(event, EVENTLOG_INFORMATION_TYPE, 0, MSG_DEFAULT, NULL, 1,
-                    0, buffmsgptr, NULL);
+                    0, (LPCSTR*) &buffptr, NULL);
         break;
     }
     DeregisterEventSource(event);
   }
 
-  /* if we created a string buffer, then delete it */
-  if (buffptr != buff)
-    delete[] buffptr;
-
   DBUG_VOID_RETURN;
 }
 #endif /* __NT__ */
@@ -4398,8 +4386,7 @@ int vprint_msg_to_log(enum loglevel level, const char *format, va_list args)
   uint length;
   DBUG_ENTER("vprint_msg_to_log");
 
-  /* "- 5" is because of print_buffer_to_nt_eventlog() */
-  length= my_vsnprintf(buff, sizeof(buff) - 5, format, args);
+  length= my_vsnprintf(buff, sizeof(buff), format, args);
   print_buffer_to_file(level, buff);
 
 #ifdef __NT__