diff options
| author | unknown <stewart@willster.(none)> | 2006-06-28 22:16:04 +1000 |
|---|---|---|
| committer | unknown <stewart@willster.(none)> | 2006-06-28 22:16:04 +1000 |
| commit | 842ae81df080d09fc6a0fd17f2291e868521eb34 (patch) | |
| tree | 49ae743c683a713654c5acb0178c552280931ccc | |
| parent | 42f612626f7825a3eac4d3dadd841c1fa344fb81 (diff) | |
| parent | 7273e37d04a765f2f0fe341897eeef14321356c3 (diff) | |
| download | mariadb-git-842ae81df080d09fc6a0fd17f2291e868521eb34.tar.gz | |
Merge mysql.com:/home/stewart/Documents/MySQL/5.1/ndb
into mysql.com:/home/stewart/Documents/MySQL/5.1/merge
sql/ha_ndbcluster.cc:
Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
| -rw-r--r-- | sql/ha_ndbcluster.cc | 4 | ||||
| -rw-r--r-- | storage/ndb/src/mgmsrv/ConfigInfo.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc index 8608a545e91..54fea1e728a 100644 --- a/sql/ha_ndbcluster.cc +++ b/sql/ha_ndbcluster.cc @@ -186,8 +186,8 @@ static int update_status_variables(Ndb_cluster_connection *c) 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}, + {"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} diff --git a/storage/ndb/src/mgmsrv/ConfigInfo.cpp b/storage/ndb/src/mgmsrv/ConfigInfo.cpp index 1270dccab6e..6c172a29819 100644 --- a/storage/ndb/src/mgmsrv/ConfigInfo.cpp +++ b/storage/ndb/src/mgmsrv/ConfigInfo.cpp @@ -878,7 +878,7 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { false, ConfigInfo::CI_INT, "8", - "1", + "3", STR_VALUE(MAX_INT_RNIL) }, { |