bzr commit into mysql-5.0-bugteam branch (joro:2781) Bug#45287

[Georgi Kodinov]

#At file:///Users/kgeorge/mysql/work/B45287-5.0-bugteam/ based on revid:joro@stripped

 2781 Georgi Kodinov	2009-07-15
      Bug #45287: phase 1 : 32 bit compilation warnings
      
      Fixed the following problems:
      1. cmake 2.6 warning because of a changed default on
      how the dependencies to libraries with a specified 
      path are resolved.
      Set to the new behavior because in MySQL's cmake there
      are no such libraries.
      2. Removed an obsolete pre-NT4 hack including defining
      Windows system defines to alter the behavior of windows.h.
      3. Disabled warning C4065 on compiling sql_yacc.cc because
      of a know incompatibility in some of the newer bison binaries.

    modified:
      CMakeLists.txt
      include/config-win.h
      sql/sql_yacc.yy
=== modified file 'CMakeLists.txt'
--- a/CMakeLists.txt	2009-05-20 21:04:34 +0000
+++ b/CMakeLists.txt	2009-07-15 12:21:20 +0000
@@ -30,6 +30,13 @@ ADD_DEFINITIONS(-DHAVE_YASSL)
 # Set debug options
 SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DFORCE_INIT_OF_VARS")
 
+# Quell a CMake 2.6 warning by selecting the 2.6 default behavior with cmake 2.6
+# This is safe to do since no TARGET_LINK_LIBRARIES in the current set
+# of files are using paths to libraries
+if(COMMAND cmake_policy)
+  cmake_policy(SET CMP0003 NEW)
+endif(COMMAND cmake_policy)
+
 # Note that some engines are always compiled in, MyISAM, MyISAMMRG, HEAP
 
 IF(WITH_COMMUNITY_FEATURES)

=== modified file 'include/config-win.h'
--- a/include/config-win.h	2009-05-26 22:44:58 +0000
+++ b/include/config-win.h	2009-07-15 12:21:20 +0000
@@ -15,15 +15,6 @@
 
 /* Defines for Win32 to make it compatible for MySQL */
 
-#ifdef __WIN2000__
-/* We have to do this define before including windows.h to get the AWE API
-functions */
-#define _WIN32_WINNT     0x0500
-#else
-/* Get NT 4.0 functions */
-#define _WIN32_WINNT     0x0400
-#endif
-
 #if defined(_MSC_VER) && _MSC_VER >= 1400
 /* Avoid endless warnings about sprintf() etc. being unsafe. */
 #define _CRT_SECURE_NO_DEPRECATE 1

=== modified file 'sql/sql_yacc.yy'
--- a/sql/sql_yacc.yy	2009-06-17 13:54:01 +0000
+++ b/sql/sql_yacc.yy	2009-07-15 12:21:20 +0000
@@ -41,6 +41,12 @@
 #include <myisam.h>
 #include <myisammrg.h>
 
+/* this is to get the bison compilation windows warnings out */
+#ifdef _MSC_VER
+/* warning C4065: switch statement contains 'default' but no 'case' labels */
+#pragma warning (disable : 4065)
+#endif
+
 int yylex(void *yylval, void *yythd);
 
 const LEX_STRING null_lex_str={0,0};


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