summaryrefslogtreecommitdiff
path: root/sql/ha_ndbcluster.cc
diff options
context:
space:
mode:
authorstewart@mysql.com <>2006-06-28 22:25:41 +1000
committerstewart@mysql.com <>2006-06-28 22:25:41 +1000
commit11c38b0f9eaef627486f10f67c3e3e625cd5fcc2 (patch)
treed6a73fa294acb3c1fa59dc4ee0c2f8d71e785d29 /sql/ha_ndbcluster.cc
parent18e008a1ba9cee7ab89096ccf216a9db676a5314 (diff)
parentbfda9249a26b312ec5ba078ddc3540ca981f1abe (diff)
downloadmariadb-git-11c38b0f9eaef627486f10f67c3e3e625cd5fcc2.tar.gz
Merge mysql.com:/home/stewart/Documents/MySQL/5.0/ndb
into mysql.com:/home/stewart/Documents/MySQL/5.0/merge
Diffstat (limited to 'sql/ha_ndbcluster.cc')
-rw-r--r--sql/ha_ndbcluster.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc
index ced85d1a339..927b60ed3fc 100644
--- a/sql/ha_ndbcluster.cc
+++ b/sql/ha_ndbcluster.cc
@@ -160,8 +160,8 @@ static int update_status_variables(Ndb_cluster_connection *c)
struct show_var_st 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},
+ {"config_from_host", (char*) &ndb_connected_host, SHOW_CHAR_PTR},
+ {"config_from_port", (char*) &ndb_connected_port, SHOW_LONG},
// {"number_of_replicas", (char*) &ndb_number_of_replicas, SHOW_LONG},
{"number_of_storage_nodes",(char*) &ndb_number_of_storage_nodes, SHOW_LONG},
{NullS, NullS, SHOW_LONG}