bzr commit into mysql-5.1-telco-7.0 branch (magnus.blaudd:2901)

[Magnus Blåudd]

#At file:///home/msvensson/mysql/7.0/ based on revid:magnus.blaudd@strippedcy5sy9ccrl

 2901 Magnus Blåudd	2009-05-15 [merge]
      Merge

    modified:
      storage/ndb/src/common/mgmcommon/IPCConfig.cpp
      storage/ndb/src/common/transporter/TCP_Transporter.cpp
      storage/ndb/src/common/transporter/Transporter.cpp
      storage/ndb/src/common/transporter/Transporter.hpp
      storage/ndb/src/ndbapi/ndb_cluster_connection.cpp
=== modified file 'storage/ndb/src/common/mgmcommon/IPCConfig.cpp'
--- a/storage/ndb/src/common/mgmcommon/IPCConfig.cpp	2008-11-12 08:22:03 +0000
+++ b/storage/ndb/src/common/mgmcommon/IPCConfig.cpp	2009-05-15 08:01:59 +0000
@@ -86,7 +86,7 @@ IPCConfig::configureTransporters(Uint32 
     ndb_mgm_configuration_iterator iter(config, CFG_SECTION_NODE);
     if (tr.get_transporter(i) && iter.find(CFG_NODE_ID, i))
     {
-      // Transporter exist in TransporterResgistry but not
+      // Transporter exist in TransporterRegistry but not
       // in configuration
       ndbout_c("The connection to node %d could not "
                "be removed at this time", i);

=== modified file 'storage/ndb/src/common/transporter/TCP_Transporter.cpp'
--- a/storage/ndb/src/common/transporter/TCP_Transporter.cpp	2008-11-12 13:01:03 +0000
+++ b/storage/ndb/src/common/transporter/TCP_Transporter.cpp	2009-05-15 08:01:59 +0000
@@ -123,7 +123,7 @@ TCP_Transporter::configure_derived(const
       (int)conf->tcp.tcpMaxsegSize == sockOptTcpMaxSeg &&
       overload_limit(conf) == m_overload_limit)
     return true; // No change
-ndbout_c("configure_derived, can't reconfigure");
+
   return false; // Can't reconfigure
 }
 

=== modified file 'storage/ndb/src/common/transporter/Transporter.cpp'
--- a/storage/ndb/src/common/transporter/Transporter.cpp	2009-01-08 15:32:09 +0000
+++ b/storage/ndb/src/common/transporter/Transporter.cpp	2009-05-15 07:54:19 +0000
@@ -42,6 +42,7 @@ Transporter::Transporter(TransporterRegi
     isServer(lNodeId==serverNodeId),
     m_packer(_signalId, _checksum), m_max_send_buffer(max_send_buffer),
     m_overload_limit(0xFFFFFFFF), isMgmConnection(_isMgmConnection),
+    m_connected(false),
     m_type(_type),
     m_transporter_registry(t_reg)
 {
@@ -71,7 +72,6 @@ Transporter::Transporter(TransporterRegi
   checksumUsed    = _checksum;
   signalIdUsed    = _signalId;
 
-  m_connected     = false;
   m_timeOutMillis = 30000;
 
   m_connect_address.s_addr= 0;
@@ -131,21 +131,18 @@ Transporter::connect_server(NDB_SOCKET_T
   DBUG_ENTER("Transporter::connect_server");
 
   if(m_connected)
-  {
-    DBUG_RETURN(false); // TODO assert(0);
-  }
-  
+    DBUG_RETURN(false);
+
   get_callback_obj()->reset_send_buffer(remoteNodeId);
 
   my_socket_connect_address(sockfd, &m_connect_address);
 
-  bool res = connect_server_impl(sockfd);
-  if(res){
-    m_connected  = true;
-    m_errorCount = 0;
-  }
+  if (!connect_server_impl(sockfd))
+    DBUG_RETURN(false);
 
-  DBUG_RETURN(res);
+  m_connected  = true;
+
+  DBUG_RETURN(true);
 }
 
 
@@ -268,22 +265,21 @@ Transporter::connect_client(NDB_SOCKET_T
   // Cache the connect address
   my_socket_connect_address(sockfd, &m_connect_address);
 
-  bool res = connect_client_impl(sockfd);
-  if (res)
-  {
-    m_connected  = true;
-    m_errorCount = 0;
-  }
-  DBUG_RETURN(res);
+  if (!connect_client_impl(sockfd))
+    DBUG_RETURN(false);
+
+  m_connected = true;
+
+  DBUG_RETURN(true);
 }
 
 void
 Transporter::doDisconnect() {
 
   if(!m_connected)
-    return; //assert(0); TODO will fail
+    return;
 
-  m_connected= false;
+  m_connected = false;
 
   get_callback_obj()->reset_send_buffer(remoteNodeId);
   disconnectImpl();

=== modified file 'storage/ndb/src/common/transporter/Transporter.hpp'
--- a/storage/ndb/src/common/transporter/Transporter.hpp	2008-11-12 08:17:14 +0000
+++ b/storage/ndb/src/common/transporter/Transporter.hpp	2009-05-15 07:54:19 +0000
@@ -174,12 +174,7 @@ private:
 
 protected:
   Uint32 m_os_max_iovec;
-
-  Uint32 getErrorCount();
-  Uint32 m_errorCount;
   Uint32 m_timeOutMillis;
-
-protected:
   bool m_connected;     // Are we connected
   TransporterType m_type;
 
@@ -211,13 +206,6 @@ Transporter::getLocalNodeId() const {
   return localNodeId;
 }
 
-inline
-Uint32
-Transporter::getErrorCount()
-{ 
-  return m_errorCount;
-}
-
 /**
  * Get data to send (in addition to data possibly remaining from previous
  * partial send).

=== modified file 'storage/ndb/src/ndbapi/ndb_cluster_connection.cpp'
--- a/storage/ndb/src/ndbapi/ndb_cluster_connection.cpp	2009-03-26 08:33:33 +0000
+++ b/storage/ndb/src/ndbapi/ndb_cluster_connection.cpp	2009-05-15 08:00:55 +0000
@@ -280,15 +280,13 @@ const char *Ndb_cluster_connection::get_
  */
 
 Ndb_cluster_connection_impl::
-Ndb_cluster_connection_impl(const char *
-                            connect_string,
+Ndb_cluster_connection_impl(const char * connect_string,
                             Ndb_cluster_connection *main_connection)
   : Ndb_cluster_connection(*this),
     m_main_connection(main_connection),
     m_optimized_node_selection(1),
     m_name(0),
     m_run_connect_thread(0),
-    m_event_add_drop_mutex(0),
     m_latest_trans_gci(0),
     m_first_ndb_object(0),
     m_latest_error_msg(),
@@ -340,11 +338,9 @@ Ndb_cluster_connection_impl(const char *
   }
   NdbMutex_Unlock(g_ndb_connection_mutex);
 
-  if (!m_event_add_drop_mutex)
-    m_event_add_drop_mutex= NdbMutex_Create();
+  m_event_add_drop_mutex= NdbMutex_Create();
   m_new_delete_ndb_mutex = NdbMutex_Create();
 
-
   m_connect_thread= 0;
   m_connect_callback= 0;
 
@@ -382,9 +378,6 @@ Ndb_cluster_connection_impl(const char *
       new TransporterFacade(m_main_connection->m_impl.m_globalDictCache);
   }
 
-
-
-
   DBUG_VOID_RETURN;
 }
 
@@ -464,8 +457,10 @@ Ndb_cluster_connection_impl::~Ndb_cluste
 
   if (m_event_add_drop_mutex)
     NdbMutex_Destroy(m_event_add_drop_mutex);
+  m_event_add_drop_mutex = 0;
 
-  NdbMutex_Destroy(m_new_delete_ndb_mutex);
+  if (m_new_delete_ndb_mutex)
+    NdbMutex_Destroy(m_new_delete_ndb_mutex);
   m_new_delete_ndb_mutex = 0;
   
   DBUG_VOID_RETURN;

Attachment: [text/bzr-bundle] bzr/[e-mail]