Windows fix:

In case getaddrinfo() returns an error, we return the WSA Error code instead of gai error. (For more information please read https://msdn.microsoft.com/en-us/library/windows/desktop/ms738520(v=vs.85).aspx)
mariadb-corporation · Jun 22, 2016 · 0050d71 · 0050d71
1 parent 1aa8720
commit 0050d71
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/libmariadb/libmariadb.c b/libmariadb/libmariadb.c
@@ -1731,9 +1731,15 @@ MYSQL *mthd_my_real_connect(MYSQL *mysql, const char *host, const char *user,
       }
       if (bind_gai_rc != 0 || !bind_res)
       {
-        my_set_error(mysql, CR_UNKNOWN_HOST, SQLSTATE_UNKNOWN, 
-                     ER(CR_UNKNOWN_HOST), mysql->options.bind_address, 
+#ifndef _WIN32
+        my_set_error(mysql, CR_UNKNOWN_HOST, SQLSTATE_UNKNOWN,
+                     ER(CR_UNKNOWN_HOST), mysql->options.bind_address,
                      bind_gai_rc == EAI_SYSTEM ? errno : bind_gai_rc);
+#else
+        my_set_error(mysql, CR_UNKNOWN_HOST, SQLSTATE_UNKNOWN,
+                     ER(CR_UNKNOWN_HOST), mysql->options.bind_address,
+                     WSAGetLastError());
+#endif
         goto error;
       }
     }
@@ -1757,9 +1763,15 @@ MYSQL *mthd_my_real_connect(MYSQL *mysql, const char *host, const char *user,
     {
       if (bind_res)
         freeaddrinfo(bind_res);
+#ifndef _WIN32
       my_set_error(mysql, CR_UNKNOWN_HOST, SQLSTATE_UNKNOWN, 
                    ER(CR_UNKNOWN_HOST), host,
                    gai_rc == EAI_SYSTEM ? errno : gai_rc);
+#else
+      my_set_error(mysql, CR_UNKNOWN_HOST, SQLSTATE_UNKNOWN, 
+                   ER(CR_UNKNOWN_HOST), host,
+                   WSAGetLastError());
+#endif
       goto error;
     }