Merge branch 'mysql-8.0' into mysql-trunk

Change-Id: Ib2f8e5db6f9fb62cc099e6d2200989524e65f182

Author: zmur

storage/ndb/include/mgmapi/mgmapi.h

@@ -332,8 +332,6 @@ struct ssl_ctx_st;
        INET6_ADDRSTRLEN
 #endif
     ];
-
-    void init();
   };
 
   /**
@@ -802,7 +800,7 @@ struct ssl_ctx_st;
    * @return Node state of cs at position i
    */
   struct ndb_mgm_node_state2 *
-  ndb_mgm_get_node_status(ndb_mgm_cluster_state2 *cs, int i);
+  ndb_mgm_get_node_status(struct ndb_mgm_cluster_state2 *cs, int i);
 
   /**
    * Get the number of nodes in a cluster state
@@ -811,7 +809,7 @@ struct ssl_ctx_st;
    * @return Number of nodes in the cluster state
    */
   int
-  ndb_mgm_get_status_node_count(ndb_mgm_cluster_state2 *cs);
+  ndb_mgm_get_status_node_count(struct ndb_mgm_cluster_state2 *cs);
 
   /**
    * Dump state

storage/ndb/include/ndb_version.h.in

@@ -25,6 +25,7 @@
 #ifndef NDB_VERSION_H
 #define NDB_VERSION_H
 
+#include <stdbool.h>
 #include <ndb_types.h>
 #include <mysql_version.h>
 

storage/ndb/src/mgmapi/mgmapi.cpp

@@ -1517,22 +1517,6 @@ ndb_mgm_get_status_node_count(ndb_mgm_cluster_state2 *cs)
   return cs->no_of_nodes;
 }
 
-void
-ndb_mgm_node_state2::init()
-{
-  node_id = 0;
-  node_type = NDB_MGM_NODE_TYPE_UNKNOWN;
-  node_status = NDB_MGM_NODE_STATUS_UNKNOWN;
-  start_phase = 0;
-  dynamic_id = 0;
-  node_group = 0;
-  version = 0;
-  connect_count = 0;
-  mysql_version = 0;
-  is_single_user = 0;
-  memset(connect_address, 0, sizeof(connect_address));
-}
-
 extern "C"
 struct ndb_mgm_cluster_state2 *
 ndb_mgm_get_status3(NdbMgmHandle handle, const enum ndb_mgm_node_type types[])