Commit 86e35aff authored by serg@serg.mylan's avatar serg@serg.mylan

after merge fix

parent 923e7cfd
...@@ -224,7 +224,7 @@ static int update_status_variables(Ndb_cluster_connection *c) ...@@ -224,7 +224,7 @@ static int update_status_variables(Ndb_cluster_connection *c)
return 0; return 0;
} }
struct show_var_st ndb_status_variables[]= { SHOW_VAR ndb_status_variables[]= {
{"cluster_node_id", (char*) &ndb_cluster_node_id, SHOW_LONG}, {"cluster_node_id", (char*) &ndb_cluster_node_id, SHOW_LONG},
{"connected_host", (char*) &ndb_connected_host, SHOW_CHAR_PTR}, {"connected_host", (char*) &ndb_connected_host, SHOW_CHAR_PTR},
{"connected_port", (char*) &ndb_connected_port, SHOW_LONG}, {"connected_port", (char*) &ndb_connected_port, SHOW_LONG},
......
...@@ -769,7 +769,7 @@ private: ...@@ -769,7 +769,7 @@ private:
Ndb *get_ndb(); Ndb *get_ndb();
}; };
extern struct show_var_st ndb_status_variables[]; extern SHOW_VAR ndb_status_variables[];
bool ndbcluster_init(void); bool ndbcluster_init(void);
int ndbcluster_end(ha_panic_function flag); int ndbcluster_end(ha_panic_function flag);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment