bzr commit into mysql-trunk-bugfixing branch (vvaintroub:3067)

[Vladislav Vaintroub]

#At file:///H:/bzr-new/mysql-trunk-bugfixing/ based on revid:alik@stripped

 3067 Vladislav Vaintroub	2010-06-22
      Fix ~1000 warnings class/struct mismatch.
      Handle this warning in the future as error, this will prevent pushing to main trees.

    modified:
      cmake/os/Windows.cmake
      sql/sql_lex.h
=== modified file 'cmake/os/Windows.cmake'
--- a/cmake/os/Windows.cmake	2010-03-07 23:31:06 +0000
+++ b/cmake/os/Windows.cmake	2010-06-22 16:40:14 +0000
@@ -110,6 +110,10 @@ IF(MSVC)
     ADD_DEFINITIONS(/wd4996)
   ENDIF()
 
+  # Make class/struct definition mismatch an error (overseen too often,
+  # adds tons of new warnings)
+  ADD_DEFINITIONS(/we4099)
+
   IF(CMAKE_SIZEOF_VOID_P MATCHES 8)
     # _WIN64 is defined by the compiler itself. 
     # Yet, we define it here again   to work around a bug with  Intellisense 

=== modified file 'sql/sql_lex.h'
--- a/sql/sql_lex.h	2010-06-17 13:31:51 +0000
+++ b/sql/sql_lex.h	2010-06-22 16:40:14 +0000
@@ -998,7 +998,7 @@ extern const LEX_STRING null_lex_str;
 extern const LEX_STRING empty_lex_str;
 
 
-struct Sroutine_hash_entry;
+class Sroutine_hash_entry;
 
 /*
   Class representing list of all tables used by statement and other


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