Fixed typos and failed mysqld--help test.

cmake/os/Windows.cmake

@@ -64,13 +64,17 @@ IF(MSVC)
    SET(CMAKE_{type}_LINKER_FLAGS_RELEASE "${CMAKE_${type}_LINKER_FLAGS_RELEASE} /debug")
   ENDFOREACH()
   
-  # Force static runtime libraries, and remove support for exception handling
+  # Force static runtime libraries
   FOREACH(flag 
    CMAKE_C_FLAGS_RELEASE CMAKE_C_FLAGS_RELWITHDEBINFO 
    CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_DEBUG_INIT 
    CMAKE_CXX_FLAGS_RELEASE  CMAKE_CXX_FLAGS_RELWITHDEBINFO
    CMAKE_CXX_FLAGS_DEBUG  CMAKE_CXX_FLAGS_DEBUG_INIT)
    STRING(REPLACE "/MD"  "/MT" "${flag}" "${${flag}}")
+  ENDFOREACH()
+  
+  # Remove support for exceptions
+  FOREACH(flag CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_INIT)
    STRING(REPLACE "/EHsc" ""   "${flag}" "${${flag}}") 
   ENDFOREACH()
  

cmake/plugin.cmake

@@ -111,10 +111,9 @@ MACRO(MYSQL_ADD_PLUGIN)
 
     # Update mysqld dependencies
     SET (MYSQLD_STATIC_PLUGIN_LIBS ${MYSQLD_STATIC_PLUGIN_LIBS} 
-      ${target} CACHE INTERNAL "")
+      ${target} CACHE INTERNAL "" FORCE)
 
-  
-    IF(ARG_STORAGE_ENGINE)
+    IF(NOT ARG_MANDATORY)
       SET(${with_var} ON CACHE BOOL "Link ${plugin} statically to the server" 
         FORCE)
     ENDIF()

configure.cmake

@@ -182,7 +182,6 @@ IF(UNIX)
     ENDIF()
   ENDIF()
 ENDIF()
-s
 
 # System check macros that do nothing on Windows.
 # Very often, it is known that some function is not available

mysql-test/include/mysqld--help.inc

@@ -14,7 +14,7 @@ perl;
                log-slow-queries pid-file slow-query-log-file
 			   datadir slave-load-tmpdir tmpdir/;
   @plugins=qw/innodb ndb archive blackhole federated partition ndbcluster safemalloc debug temp-pool ssl des-key-file
-              thread-concurrency super-large-pages mutex-deadlock-detector/;
+              thread-concurrency super-large-pages mutex-deadlock-detector null-audit/;
   @env=qw/MYSQLTEST_VARDIR MYSQL_TEST_DIR MYSQL_LIBDIR MYSQL_CHARSETSDIR MYSQL_SHAREDIR /;
   $re1=join('|', @skipvars, @plugins);
   $re2=join('|', @plugins);