diff --git a/cmake/os/Windows.cmake b/cmake/os/Windows.cmake
index 021f23a14f2..4fd01e5914e 100644
--- a/cmake/os/Windows.cmake
+++ b/cmake/os/Windows.cmake
@@ -142,6 +142,11 @@ IF(MSVC)
   SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4800 /wd4805 /wd4996 /we4700 /we4311 /we4477 /we4302 /we4090 /wd4267 ")
   SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4800 /wd4805 /wd4996 /wd4291 /wd4577 /we4099 /we4700 /we4311 /we4477 /we4302 /we4090 /wd4267")
 
+  IF(MYSQL_MAINTAINER_MODE MATCHES "ERR")
+    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /WX")
+    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /WX")
+  ENDIF()
+
 ENDIF()
 
 # Always link with socket library