bzr push into mysql-trunk branch (tor.didriksen:3443 to 3444)

[Tor Didriksen]

 3444 Tor Didriksen	2011-09-20
      testing windows

    modified:
      cmake/os/Windows.cmake
      sql/CMakeLists.txt
      sql/field.h
 3443 Tor Didriksen	2011-09-20
      Add new functions to udf_example.def so they will be exported by dll's

    modified:
      sql/udf_example.def
=== modified file 'cmake/os/Windows.cmake'
--- a/cmake/os/Windows.cmake	2011-09-19 14:29:54 +0000
+++ b/cmake/os/Windows.cmake	2011-09-20 16:35:34 +0000
@@ -54,6 +54,7 @@ ADD_DEFINITIONS("-D_WINDOWS -D__WIN__ -D
 ADD_DEFINITIONS("-D_WIN32_WINNT=0x0501")
 # Speed up build process excluding unused header files
 ADD_DEFINITIONS("-DWIN32_LEAN_AND_MEAN")
+ADD_DEFINITIONS(/EHcs)
   
 # Adjust compiler and linker flags
 IF(MINGW AND CMAKE_SIZEOF_VOID_P EQUAL 4)
@@ -78,6 +79,7 @@ IF(MSVC)
    CMAKE_CXX_FLAGS_RELEASE  CMAKE_CXX_FLAGS_RELWITHDEBINFO
    CMAKE_CXX_FLAGS_DEBUG  CMAKE_CXX_FLAGS_DEBUG_INIT)
    STRING(REPLACE "/MD"  "/MT" "${flag}" "${${flag}}")
+   MESSAGE(STATUS "flag ${flag} ${${flag}}")
   ENDFOREACH()
   
   # Remove support for exceptions

=== modified file 'sql/CMakeLists.txt'
--- a/sql/CMakeLists.txt	2011-09-19 11:20:45 +0000
+++ b/sql/CMakeLists.txt	2011-09-20 16:35:34 +0000
@@ -293,6 +293,11 @@ IF(WITH_MYSQLD_LDFLAGS)
   SET_TARGET_PROPERTIES(mysqld PROPERTIES LINK_FLAGS 
      "${MYSQLD_LINK_FLAGS} ${WITH_MYSQLD_LDFLAGS}")
 ENDIF()
+
+GET_TARGET_PROPERTY(foo mysqld LINK_FLAGS)
+MESSAGE(STATUS "mysqld link flags: ${foo}")
+MESSAGE(STATUS "mysqld_link_flags ${mysqld_link_flags}")
+
 IF(DEBUG_EXTNAME)
   INSTALL_DEBUG_TARGET(mysqld 
     DESTINATION ${INSTALL_SBINDIR} 

=== modified file 'sql/field.h'
--- a/sql/field.h	2011-09-01 10:41:37 +0000
+++ b/sql/field.h	2011-09-20 16:35:34 +0000
@@ -81,6 +81,9 @@ public:
   static void *operator new(size_t size, MEM_ROOT *mem_root) throw () {
     return alloc_root(mem_root, size);
   }
+  static void operator delete(void *ptr, MEM_ROOT *mem_root)
+  { DBUG_ASSERT(false); /* never called */ }
+
   static void operator delete(void *ptr_arg, size_t size) throw()
   { TRASH(ptr_arg, size); }
 

No bundle (reason: useless for push emails).