Bug #33975638: Enable the deprecation warnings on windows

1. removed the disablement of warning 4996 from the global scope
2. replaced with bunch of MSVC compiler defines to limit deprecated
   warnings
3. Added disablement of WL#4996 to libevent and icu builds
4. Removed some stale Win98 support code

Change-Id: I0457a660769deb173d419dac3fa36865e8cc9e4b

Author: gkodinov

cmake/os/Windows.cmake

@@ -195,30 +195,33 @@ IF(MSVC)
     STRING_APPEND(CMAKE_CXX_FLAGS " /MP")
   ENDIF()
 
-  IF(WIN32_CLANG)
-    # Adding -Wno-deprecated-declarations does not silence warnings,
-    # so add misc. macros instead.
-
-    # warning STL4015 The std::iterator class
-    # (used as a base class to provide typedefs) is deprecated in C++17
-    STRING_APPEND(CMAKE_CXX_FLAGS
-      " -D_SILENCE_CXX17_ITERATOR_BASE_CLASS_DEPRECATION_WARNING")
-
-    # 'strcpy' is deprecated. This function or variable may be unsafe.
-    STRING_APPEND(CMAKE_C_FLAGS   " -D_CRT_SECURE_NO_WARNINGS")
-    STRING_APPEND(CMAKE_CXX_FLAGS " -D_CRT_SECURE_NO_WARNINGS")
-
-    # 'getpid' is deprecated. The POSIX name for this item is deprecated.
-    # Instead use the ISO C and C++ conformant name _getpid.
-    STRING_APPEND(CMAKE_C_FLAGS   " -D_CRT_NONSTDC_NO_DEPRECATE")
-    STRING_APPEND(CMAKE_CXX_FLAGS " -D_CRT_NONSTDC_NO_DEPRECATE")
-  ENDIF()
+  #TODO(Bug#33985941): update the code and remove the disabled warnings
+
+  # warning STL4015 The std::iterator class
+  # (used as a base class to provide typedefs) is deprecated in C++17
+  STRING_APPEND(CMAKE_CXX_FLAGS
+    " -D_SILENCE_CXX17_ITERATOR_BASE_CLASS_DEPRECATION_WARNING")
+
+  # 'strcpy' is deprecated. This function or variable may be unsafe.
+  STRING_APPEND(CMAKE_C_FLAGS   " -D_CRT_SECURE_NO_WARNINGS")
+  STRING_APPEND(CMAKE_CXX_FLAGS " -D_CRT_SECURE_NO_WARNINGS")
+
+  # 'getpid' is deprecated. The POSIX name for this item is deprecated.
+  # Instead use the ISO C and C++ conformant name _getpid.
+  STRING_APPEND(CMAKE_C_FLAGS   " -D_CRT_NONSTDC_NO_DEPRECATE")
+  STRING_APPEND(CMAKE_CXX_FLAGS " -D_CRT_NONSTDC_NO_DEPRECATE")
+
+  # 'inet_addr' is deprecated. Use inet_pton()
+  STRING_APPEND(CMAKE_C_FLAGS   " -D_WINSOCK_DEPRECATED_NO_WARNINGS")
+  STRING_APPEND(CMAKE_CXX_FLAGS " -D_WINSOCK_DEPRECATED_NO_WARNINGS")
 
-  #TODO: update the code and remove the disabled warnings
+  # 'std::wbuffer_convert' is deprecated. Use MultiByteToWideChar
+  STRING_APPEND(CMAKE_C_FLAGS   " -D_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING")
+  STRING_APPEND(CMAKE_CXX_FLAGS " -D_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING")
 
-  # The compiler encountered a deprecated declaration.
-  STRING_APPEND(CMAKE_C_FLAGS " /wd4996")
-  STRING_APPEND(CMAKE_CXX_FLAGS " /wd4996")
+  # 'std::Header_strstream' is deprecated.
+  STRING_APPEND(CMAKE_C_FLAGS   " -D_SILENCE_CXX17_STRSTREAM_DEPRECATION_WARNING")
+  STRING_APPEND(CMAKE_CXX_FLAGS " -D_SILENCE_CXX17_STRSTREAM_DEPRECATION_WARNING")
 
   # 'var' : conversion from 'size_t' to 'type', possible loss of data
   STRING_APPEND(CMAKE_C_FLAGS " /wd4267")

extra/icu/CMakeLists.txt

@@ -1,4 +1,4 @@
-# Copyright (c) 2017, 2021, Oracle and/or its affiliates.
+# Copyright (c) 2017, 2022, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, version 2.0,
@@ -114,6 +114,13 @@ IF(MSVC AND NOT WIN32_CLANG)
   STRING_APPEND(CMAKE_CXX_FLAGS " /utf-8")
 ENDIF()
 
+#TODO(Bug#33986227): fix the deprecation for ICU
+IF(MSVC)
+  STRING_APPEND(CMAKE_C_FLAGS " /wd4996")
+  STRING_APPEND(CMAKE_CXX_FLAGS " /wd4996")
+ENDIF()
+
+
 IF(WITH_ICU STREQUAL "bundled")
   REMOVE_CMAKE_COMPILER_FLAGS(CMAKE_C_FLAGS "${MY_COMPILER_FLAG_FLTO}")
   REMOVE_CMAKE_COMPILER_FLAGS(CMAKE_CXX_FLAGS "${MY_COMPILER_FLAG_FLTO}")

extra/libevent/libevent-2.1.11-stable/CMakeLists.txt

@@ -29,6 +29,13 @@ IF(HAS_WARN_FLAG)
   STRING_APPEND(CMAKE_C_FLAGS " ${HAS_WARN_FLAG}")
 ENDIF()
 
+#TODO(Bug#33986250): fix the deprecation for libevent
+IF(WIN32)
+  STRING_APPEND(CMAKE_C_FLAGS " /wd4996")
+  STRING_APPEND(CMAKE_CXX_FLAGS " /wd4996")
+ENDIF()
+
+
 # Don't do this here, it will load policies for an older version of cmake.
 # cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
 

mysys/my_windac.cc

@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2021, Oracle and/or its affiliates.
+/* Copyright (c) 2000, 2022, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License, version 2.0,
@@ -34,16 +34,6 @@
 
 /* Windows NT/2000 discretionary access control utility functions. */
 
-/*
-  Check if the operating system is built on NT technology.
-
-  RETURN
-    0   Windows 95/98/Me
-    1   otherwise
-*/
-
-static bool is_nt() { return GetVersion() < 0x80000000; }
-
 /*
   Auxilary structure to store pointers to the data which we need to keep
   around while SECURITY_ATTRIBUTES is in use.
@@ -95,11 +85,6 @@ int my_security_attr_create(SECURITY_ATTRIBUTES **psa, const char **perror,
   PSID owner_sid;
   My_security_attr *attr;
 
-  if (!is_nt()) {
-    *psa = 0;
-    return 0;
-  }
-
   /*
     Get SID of Everyone group. Easier to retrieve all SIDs each time
     this function is called than worry about thread safety.

router/tests/component/CMakeLists.txt

@@ -30,6 +30,12 @@ MYSQL_ADD_EXECUTABLE(master_key_test_writer
   SKIP_INSTALL
   )
 
+#TODO(Bug#33986295): fix the deprecation for router tests
+IF(MSVC)
+  STRING_APPEND(CMAKE_C_FLAGS " /wd4996")
+  STRING_APPEND(CMAKE_CXX_FLAGS " /wd4996")
+ENDIF()
+
 ADD_DEFINITIONS(-DSSL_TEST_DATA_DIR="${CMAKE_SOURCE_DIR}/mysql-test/std_data/")
 ADD_DEFINITIONS(-DCMAKE_SOURCE_DIR="${CMAKE_SOURCE_DIR}")
 FOREACH(test_file

sql/mysqld.cc

@@ -8289,7 +8289,7 @@ int mysqld_main(int argc, char **argv) {
     }
   }
 
-  if (Service.GetOS() && mysqld_monitor) /* true NT family */
+  if (mysqld_monitor) /* true NT family */
   {
     char file_path[FN_REFLEN];
     my_path(file_path, argv[0], ""); /* Find name in path */

sql/nt_servc.cc

@@ -24,7 +24,6 @@ static NTService *pService;
 
  -------------------------------------------------------------------------- */
 NTService::NTService() {
-  bOsNT = false;
   // service variables
   ServiceName = NULL;
   hExitEvent = 0;
@@ -65,16 +64,6 @@ NTService::~NTService() {
 
  -------------------------------------------------------------------------- */
 
-BOOL NTService::GetOS() {
-  bOsNT = false;
-  memset(&osVer, 0, sizeof(OSVERSIONINFO));
-  osVer.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
-  if (GetVersionEx(&osVer)) {
-    if (osVer.dwPlatformId == VER_PLATFORM_WIN32_NT) bOsNT = true;
-  }
-  return bOsNT;
-}
-
 /**
   Registers the main service thread with the service manager.
 

sql/nt_servc.h

@@ -24,7 +24,6 @@ class NTService {
   NTService();
   ~NTService();
 
-  BOOL bOsNT;  ///< true if OS is NT, false for Win95
   // install optinos
   DWORD dwDesiredAccess;
   DWORD dwServiceType;
@@ -34,7 +33,6 @@ class NTService {
   LPSTR szLoadOrderGroup;
   LPDWORD lpdwTagID;
   LPSTR szDependencies;
-  OSVERSIONINFO osVer;
 
   // time-out (in milisec)
   int nStartTimeOut;
@@ -49,8 +47,6 @@ class NTService {
   int nError;
   DWORD dwState;
 
-  BOOL GetOS();  // returns TRUE if WinNT
-  BOOL IsNT() { return bOsNT; }
   // init service entry point
   long Init(LPCSTR szInternName, void *ServiceThread);