after merge fix

sql/ha_ndbcluster.cc

@@ -224,7 +224,7 @@ static int update_status_variables(Ndb_cluster_connection *c)
   return 0;
 }
 
-struct show_var_st ndb_status_variables[]= {
+SHOW_VAR ndb_status_variables[]= {
   {"cluster_node_id",        (char*) &ndb_cluster_node_id,         SHOW_LONG},
   {"connected_host",         (char*) &ndb_connected_host,      SHOW_CHAR_PTR},
   {"connected_port",         (char*) &ndb_connected_port,          SHOW_LONG},

sql/ha_ndbcluster.h

@@ -769,7 +769,7 @@ static void set_tabname(const char *pathname, char *tabname);
   Ndb *get_ndb();
 };
 
-extern struct show_var_st ndb_status_variables[];
+extern SHOW_VAR ndb_status_variables[];
 
 bool ndbcluster_init(void);
 int ndbcluster_end(ha_panic_function flag);