Add ability to have version "just requested" when you initially connect.

[m6w6/libmemcached] / libmemcached / connect.cc

diff --git a/libmemcached/connect.cc b/libmemcached/connect.cc
index 647ea03bceade3eb4fc87780ebec4988d94bbf0b..5a5d899d23786d8f9ccebe5fb113e21887e8461a 100644 (file)
--- a/libmemcached/connect.cc
+++ b/libmemcached/connect.cc
@@ -405,7 +405,7 @@ static memcached_return_t network_connect(org::libmemcached::Instance* server)
   bool timeout_error_occured= false;
 
   WATCHPOINT_ASSERT(server->fd == INVALID_SOCKET);
-  WATCHPOINT_ASSERT(server->cursor_active == 0);
+  WATCHPOINT_ASSERT(server->cursor_active_ == 0);
 
   /*
     We want to check both of these because if address_info_next has been fully tried, we want to do a new lookup to make sure we have picked up on any new DNS information.
@@ -641,6 +641,7 @@ static memcached_return_t backoff_handling(org::libmemcached::Instance* server,
 
 static memcached_return_t _memcached_connect(org::libmemcached::Instance* server, const bool set_last_disconnected)
 {
+  assert(server);
   if (server->fd != INVALID_SOCKET)
   {
     return MEMCACHED_SUCCESS;
@@ -696,6 +697,7 @@ static memcached_return_t _memcached_connect(org::libmemcached::Instance* server
   if (memcached_success(rc))
   {
     server->mark_server_as_clean();
+    memcached_version_instance(server);
     return rc;
   }
   else if (set_last_disconnected)