Windows related cleanups, remove old code.

- Do not scan registry to check if TCPIP is supported.
- Do not read registry under HKEY_LOCAL_MACHINE\SOFTWARE\MySQL anymore.
- Do not load threadpool function dynamically, it is available
since Win7.
- simplify win32_init_tcp_ip(), and return error of WSAStartup() fails.
- Correct comment in my_parameter_handler()

Author: vaintroub

include/my_sys.h

@@ -690,12 +690,12 @@ int my_set_user(const char *user, struct passwd *user_info, myf MyFlags);
 extern int check_if_legal_filename(const char *path);
 extern int check_if_legal_tablename(const char *path);
 
-#ifdef __WIN__
+#ifdef _WIN32
 extern my_bool is_filename_allowed(const char *name, size_t length,
                    my_bool allow_current_dir);
-#else /* __WIN__ */
+#else /* _WIN32 */
 # define is_filename_allowed(name, length, allow_cwd) (TRUE)
-#endif /* __WIN__ */ 
+#endif /* _WIN32 */ 
 
 #ifdef _WIN32
 /* Windows-only functions (CRT equivalents)*/
@@ -1045,7 +1045,7 @@ extern size_t escape_string_for_mysql(CHARSET_INFO *charset_info,
                                       char *to, size_t to_length,
                                       const char *from, size_t length);
 extern char *get_tty_password(const char *opt_message);
-#ifdef __WIN__
+#ifdef _WIN32
 #define BACKSLASH_MBTAIL
 /* File system character set */
 extern CHARSET_INFO *fs_character_set(void);
@@ -1058,8 +1058,7 @@ extern void thd_increment_bytes_sent(void *thd, size_t length);
 extern void thd_increment_bytes_received(void *thd, size_t length);
 extern void thd_increment_net_big_packet_count(void *thd, size_t length);
 
-#ifdef __WIN__
-extern my_bool have_tcpip;		/* Is set if tcpip is used */
+#ifdef _WIN32
 
 /* implemented in my_windac.c */
 

mysys/my_init.c

@@ -22,14 +22,13 @@
 #include <m_ctype.h>
 #include <signal.h>
 #include <mysql/psi/mysql_stage.h>
-#ifdef __WIN__
+#ifdef _WIN32
 #ifdef _MSC_VER
 #include <locale.h>
 #include <crtdbg.h>
 /* WSAStartup needs winsock library*/
 #pragma comment(lib, "ws2_32")
 #endif
-my_bool have_tcpip=0;
 static void my_win_init(void);
 static my_bool win32_init_tcp_ip();
 #else
@@ -119,8 +118,9 @@ my_bool my_init(void)
     my_time_init();
     my_win_init();
     DBUG_PRINT("exit", ("home: '%s'", home_dir));
-#ifdef __WIN__
-    win32_init_tcp_ip();
+#ifdef _WIN32
+    if (win32_init_tcp_ip())
+      DBUG_RETURN(1);
 #endif
 #ifdef CHECK_UNLIKELY
     init_my_likely();
@@ -218,7 +218,7 @@ Voluntary context switches %ld, Involuntary context switches %ld\n",
 	      rus.ru_msgsnd, rus.ru_msgrcv, rus.ru_nsignals,
 	      rus.ru_nvcsw, rus.ru_nivcsw);
 #endif
-#if defined(__WIN__) && defined(_MSC_VER)
+#if defined(_MSC_VER)
    _CrtSetReportMode( _CRT_WARN, _CRTDBG_MODE_FILE );
    _CrtSetReportFile( _CRT_WARN, _CRTDBG_FILE_STDERR );
    _CrtSetReportMode( _CRT_ERROR, _CRTDBG_MODE_FILE );
@@ -245,10 +245,9 @@ Voluntary context switches %ld, Involuntary context switches %ld\n",
                  (FILE *) 0);
 #endif /* defined(SAFE_MUTEX) */
 
-#ifdef __WIN__
-  if (have_tcpip)
-    WSACleanup();
-#endif /* __WIN__ */
+#ifdef _WIN32
+   WSACleanup();
+#endif
 
   /* At very last, delete mysys key, it is used everywhere including DBUG */
   pthread_key_delete(THR_KEY_mysys);
@@ -263,16 +262,14 @@ void my_debug_put_break_here(void)
 }
 #endif
 
-#ifdef __WIN__
+#ifdef _WIN32
 
 
 /*
   my_parameter_handler
   
   Invalid parameter handler we will use instead of the one "baked"
-  into the CRT for MSC v8.  This one just prints out what invalid
-  parameter was encountered.  By providing this routine, routines like
-  lseek will return -1 when we expect them to instead of crash.
+  into the CRT.
 */
 
 void my_parameter_handler(const wchar_t * expression, const wchar_t * function,
@@ -311,78 +308,14 @@ int handle_rtc_failure(int err_type, const char *file, int line,
 #pragma runtime_checks("", restore)
 #endif
 
-/*
-  Open HKEY_LOCAL_MACHINE\SOFTWARE\MySQL and set any strings found
-  there as environment variables
-*/
-static void win_init_registry(void)
-{
-  HKEY key_handle;
-
-  if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, (LPCTSTR)"SOFTWARE\\MySQL",
-                    0, KEY_READ, &key_handle) == ERROR_SUCCESS)
-  {
-    LONG ret;
-    DWORD index= 0;
-    DWORD type;
-    char key_name[256], key_data[1024];
-    DWORD key_name_len= sizeof(key_name) - 1;
-    DWORD key_data_len= sizeof(key_data) - 1;
-
-    while ((ret= RegEnumValue(key_handle, index++,
-                              key_name, &key_name_len,
-                              NULL, &type, (LPBYTE)&key_data,
-                              &key_data_len)) != ERROR_NO_MORE_ITEMS)
-    {
-      char env_string[sizeof(key_name) + sizeof(key_data) + 2];
-
-      if (ret == ERROR_MORE_DATA)
-      {
-        /* Registry value larger than 'key_data', skip it */
-        DBUG_PRINT("error", ("Skipped registry value that was too large"));
-      }
-      else if (ret == ERROR_SUCCESS)
-      {
-        if (type == REG_SZ)
-        {
-          strxmov(env_string, key_name, "=", key_data, NullS);
-
-          /* variable for putenv must be allocated ! */
-          putenv(strdup(env_string)) ;
-        }
-      }
-      else
-      {
-        /* Unhandled error, break out of loop */
-        break;
-      }
-
-      key_name_len= sizeof(key_name) - 1;
-      key_data_len= sizeof(key_data) - 1;
-    }
-
-    RegCloseKey(key_handle);
-  }
-}
-
 
 static void my_win_init(void)
 {
   DBUG_ENTER("my_win_init");
 
 #if defined(_MSC_VER)
-#if _MSC_VER < 1300
-  /*
-    Clear the OS system variable TZ and avoid the 100% CPU usage
-    Only for old versions of Visual C++
-  */
-  _putenv("TZ=");
-#endif
-#if _MSC_VER >= 1400
-  /* this is required to make crt functions return -1 appropriately */
   _set_invalid_parameter_handler(my_parameter_handler);
 #endif
-#endif
 
 #ifdef __MSVC_RUNTIME_CHECKS
   /*
@@ -394,75 +327,22 @@ static void my_win_init(void)
 
   _tzset();
 
-  win_init_registry();
-
   DBUG_VOID_RETURN;
 }
 
 
-/*------------------------------------------------------------------
-  Name: CheckForTcpip| Desc: checks if tcpip has been installed on system
-  According to Microsoft Developers documentation the first registry
-  entry should be enough to check if TCP/IP is installed, but as expected
-  this doesn't work on all Win32 machines :(
-------------------------------------------------------------------*/
-
-#define TCPIPKEY  "SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters"
-#define WINSOCK2KEY "SYSTEM\\CurrentControlSet\\Services\\Winsock2\\Parameters"
-#define WINSOCKKEY  "SYSTEM\\CurrentControlSet\\Services\\Winsock\\Parameters"
-
-static my_bool win32_have_tcpip(void)
-{
-  HKEY hTcpipRegKey;
-  if (RegOpenKeyEx ( HKEY_LOCAL_MACHINE, TCPIPKEY, 0, KEY_READ,
-		      &hTcpipRegKey) != ERROR_SUCCESS)
-  {
-    if (RegOpenKeyEx ( HKEY_LOCAL_MACHINE, WINSOCK2KEY, 0, KEY_READ,
-		      &hTcpipRegKey) != ERROR_SUCCESS)
-    {
-      if (RegOpenKeyEx ( HKEY_LOCAL_MACHINE, WINSOCKKEY, 0, KEY_READ,
-			 &hTcpipRegKey) != ERROR_SUCCESS)
-	if (!getenv("HAVE_TCPIP") || have_tcpip)	/* Provide a workaround */
-	  return (FALSE);
-    }
-  }
-  RegCloseKey ( hTcpipRegKey);
-  return (TRUE);
-}
-
-
 static my_bool win32_init_tcp_ip()
 {
-  if (win32_have_tcpip())
+  WORD wVersionRequested = MAKEWORD( 2, 2 );
+  WSADATA wsaData;
+  if (WSAStartup(wVersionRequested, &wsaData))
   {
-    WORD wVersionRequested = MAKEWORD( 2, 2 );
-    WSADATA wsaData;
- 	/* Be a good citizen: maybe another lib has already initialised
- 		sockets, so don't clobber them unless necessary */
-    if (WSAStartup( wVersionRequested, &wsaData ))
-    {
-      /* Load failed, maybe because of previously loaded
-	 incompatible version; try again */
-      WSACleanup( );
-      if (!WSAStartup( wVersionRequested, &wsaData ))
-	have_tcpip=1;
-    }
-    else
-    {
-      if (wsaData.wVersion != wVersionRequested)
-      {
-	/* Version is no good, try again */
-	WSACleanup( );
-	if (!WSAStartup( wVersionRequested, &wsaData ))
-	  have_tcpip=1;
-      }
-      else
-	have_tcpip=1;
-    }
+    fprintf(stderr, "WSAStartup() failed with error: %d\n", WSAGetLastError());
+    return 1;
   }
   return(0);
 }
-#endif /* __WIN__ */
+#endif /* _WIN32 */
 
 PSI_stage_info stage_waiting_for_table_level_lock=
 {0, "Waiting for table level lock", 0};