From b1e0231b150cb9ca86a50d6098bc55e2a1b42032 Mon Sep 17 00:00:00 2001
From: Georg Richter <georg@mariadb.com>
Date: Wed, 1 Jul 2015 15:31:32 +0200
Subject: [PATCH] Fix for CONC-135: Return value of mysql_get_socket()
 indicating "no socket" not defined mysql_get_socket now returns in case of
 error: MARIADB_INVALID_SOCKET instead of INVALID_SOCKET (which isn't defined
 on several OS). MARIADB_INVALID_SOCKET is defined as -1.

---
 include/mysql.h         | 1 +
 libmariadb/libmariadb.c | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/include/mysql.h b/include/mysql.h
index 515c3b87..4b10453a 100644
--- a/include/mysql.h
+++ b/include/mysql.h
@@ -331,6 +331,7 @@ typedef struct st_mysql_time
 
 #define AUTO_SEC_PART_DIGITS 31
 #define SEC_PART_DIGITS 6
+#define MARIADB_INVALID_SOCKET -1
 
 /* Ansynchronous API constants */
 #define MYSQL_WAIT_READ      1
diff --git a/libmariadb/libmariadb.c b/libmariadb/libmariadb.c
index 76c1e6ca..9afe1400 100644
--- a/libmariadb/libmariadb.c
+++ b/libmariadb/libmariadb.c
@@ -3551,7 +3551,7 @@ mysql_get_socket(const MYSQL *mysql)
 {
   if (mysql->net.vio)
     return vio_fd(mysql->net.vio);
-  return INVALID_SOCKET;
+  return MARIADB_INVALID_SOCKET;
 }
 
 /*