Commit bb65bbe3 authored by stewart@mysql.com's avatar stewart@mysql.com

return NDB_INVALID_SOCKET instead of -1 for Windows compatibility.

(Found in review by Tomas Ulin)
parent 196def91
...@@ -1500,7 +1500,7 @@ NDB_SOCKET_TYPE TransporterRegistry::connect_ndb_mgmd(SocketClient *sc) ...@@ -1500,7 +1500,7 @@ NDB_SOCKET_TYPE TransporterRegistry::connect_ndb_mgmd(SocketClient *sc)
*/ */
cs= (char*)malloc((strlen(sc->get_server_name())+20)*sizeof(char)); cs= (char*)malloc((strlen(sc->get_server_name())+20)*sizeof(char));
if(!cs) if(!cs)
return -1; return NDB_INVALID_SOCKET;
d= true; d= true;
} }
else else
...@@ -1512,7 +1512,7 @@ NDB_SOCKET_TYPE TransporterRegistry::connect_ndb_mgmd(SocketClient *sc) ...@@ -1512,7 +1512,7 @@ NDB_SOCKET_TYPE TransporterRegistry::connect_ndb_mgmd(SocketClient *sc)
ndb_mgm_set_connectstring(h, cs); ndb_mgm_set_connectstring(h, cs);
if(ndb_mgm_connect(h, 0, 0, 0)<0) if(ndb_mgm_connect(h, 0, 0, 0)<0)
return -1; return NDB_INVALID_SOCKET;
for(unsigned int i=0;i < m_transporter_interface.size();i++) for(unsigned int i=0;i < m_transporter_interface.size();i++)
ndb_mgm_set_connection_int_parameter(h, ndb_mgm_set_connection_int_parameter(h,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment