lp:893522 more problems found by PVS Studio

sql/scheduler.cc

@@ -514,7 +514,7 @@ static void libevent_connection_close(THD *thd)
 
   thd->killed= THD::KILL_CONNECTION;          // Avoid error messages
 
-  if (thd->net.vio->sd >= 0)                  // not already closed
+  if (thd->net.vio->type != VIO_CLOSED) // not already closed
   {
     end_connection(thd);
     close_connection(thd, 0, 1);

sql/winservice.c

@@ -116,7 +116,7 @@ int get_mysql_service_properties(const wchar_t *bin_path,
     wcscat(mysqld_path, L".exe");
 
   if(wcsicmp(file_part, L"mysqld.exe") != 0 && 
-    wcsicmp(file_part, L"mysqld.exe") != 0 &&
+    wcsicmp(file_part, L"mysqld-debug.exe") != 0 &&
     wcsicmp(file_part, L"mysqld-nt.exe") != 0)
   {
     /* The service executable is not mysqld. */
@@ -244,4 +244,4 @@ int get_mysql_service_properties(const wchar_t *bin_path,
 end:
   LocalFree((HLOCAL)args);
   return retval;
-}
\ No newline at end of file
+}