Merge branch '10.4' into 10.5

MariaDB · Jun 1, 2020 · 6e6d79a · 6e6d79a
2 parents ade8253 + f1c35a9
commit 6e6d79a
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/win/packaging/ca/CustomAction.cpp b/win/packaging/ca/CustomAction.cpp
@@ -326,7 +326,7 @@ static bool IsPortInUse(unsigned short port)
   }
 
   bool in_use = false;
-  if (bind(ip_sock, a->ai_addr, a->ai_addrlen) == SOCKET_ERROR)
+  if (bind(ip_sock, a->ai_addr, (int)a->ai_addrlen) == SOCKET_ERROR)
   {
     DWORD last_error = WSAGetLastError();
     in_use = (last_error ==  WSAEADDRINUSE || last_error == WSAEACCES);