bzr commit into mysql-5.5-next-mr branch (alik:2935)

[Alexander Nozdrin]

#At file:///mnt/raid/alik/MySQL/bzr/00.merges/mysql-next-mr-merge/ based on revid:alik@stripped

 2935 Alexander Nozdrin	2009-11-06 [merge]
      Auto-merge from mysql-trunk-merge.

    modified:
      extra/yassl/taocrypt/src/random.cpp
      mysql-test/lib/My/SafeProcess/safe_process_win.cc
=== modified file 'extra/yassl/taocrypt/src/random.cpp'
--- a/extra/yassl/taocrypt/src/random.cpp	2007-01-29 15:54:40 +0000
+++ b/extra/yassl/taocrypt/src/random.cpp	2009-10-06 16:10:34 +0000
@@ -27,7 +27,6 @@
 #include <time.h>
 
 #if defined(_WIN32)
-    #define _WIN32_WINNT 0x0400
     #include <windows.h>
     #include <wincrypt.h>
 #else

=== modified file 'mysql-test/lib/My/SafeProcess/safe_process_win.cc'
--- a/mysql-test/lib/My/SafeProcess/safe_process_win.cc	2009-07-23 17:01:24 +0000
+++ b/mysql-test/lib/My/SafeProcess/safe_process_win.cc	2009-10-06 16:10:34 +0000
@@ -50,9 +50,6 @@
            is killed.
 */
 
-/* Requires Windows 2000 or higher */
-#define _WIN32_WINNT 0x0500
-
 #include <windows.h>
 #include <stdio.h>
 #include <tlhelp32.h>


Attachment: [text/bzr-bundle] bzr/[e-mail]