Merge branch 'mysql-5.7-cluster-7.6' into mysql-8.0

Change-Id: I69c5572ca5918e9aed8b9472d98e18ce39f27176

Author: frazerclement

storage/ndb/src/common/transporter/TransporterRegistry.cpp

@@ -367,13 +367,25 @@ void TransporterRegistry::reset_total_spintime() const
   receiveHandle->m_total_spintime = 0;
 }
 
+/**
+ * Time limit for individual MGMAPI activities, including
+ * TCP connection
+ * Handshake, auth, TLS
+ * MGMAPI command responses (except where overridden)
+ * Affects:
+ *   - TR MGMAPI connection used to manage dynamic ports
+ *   - Transporter-to-MGMD MGMAPI connections converted
+ *     to transporters
+ */
+static const Uint32 MGM_TIMEOUT_MILLIS=5000;
+
 void TransporterRegistry::set_mgm_handle(NdbMgmHandle h)
 {
   DBUG_ENTER("TransporterRegistry::set_mgm_handle");
   if (m_mgm_handle)
     ndb_mgm_destroy_handle(&m_mgm_handle);
   m_mgm_handle= h;
-  ndb_mgm_set_timeout(m_mgm_handle, 5000);
+  ndb_mgm_set_timeout(m_mgm_handle, MGM_TIMEOUT_MILLIS);
 #ifndef NDEBUG
   if (h)
   {
@@ -3821,6 +3833,11 @@ TransporterRegistry::connect_ndb_mgmd(const char* server_name,
     ndb_mgm_set_connectstring(h, cs.c_str());
   }
 
+  /**
+   * Set timeout
+   */
+  ndb_mgm_set_timeout(h, MGM_TIMEOUT_MILLIS);
+
   if(ndb_mgm_connect(h, 0, 0, 0)<0)
   {
     DBUG_PRINT("info", ("connection to mgmd failed"));