summaryrefslogtreecommitdiff
path: root/ndb/src/mgmsrv
diff options
context:
space:
mode:
authorunknown <stewart@mysql.com>2005-01-12 18:41:00 +1100
committerunknown <stewart@mysql.com>2005-01-12 18:41:00 +1100
commit48f05d2fce9abde7f0f46e6f5645b5ffaec35eea (patch)
tree9eace3c25ec0e83ef1207fb61809158705b82bc0 /ndb/src/mgmsrv
parent61eec3db43fce505dbccd9f7c49c504838c84845 (diff)
parent5615ff29bbffe2f0c080b6a3cd7f944d9c23df67 (diff)
downloadmariadb-git-48f05d2fce9abde7f0f46e6f5645b5ffaec35eea.tar.gz
Merge mysql.com:/home/stewart/Documents/MySQL/5.0/ndb-dynamic-ports-impl3
into mysql.com:/home/stewart/Documents/MySQL/5.0/ndb-dynamic-ports-impl4 ndb/src/common/transporter/TransporterRegistry.cpp: Auto merged ndb/src/mgmapi/mgmapi.cpp: Auto merged ndb/src/mgmsrv/MgmtSrvr.cpp: Auto merged ndb/src/mgmsrv/Services.cpp: Auto merged
Diffstat (limited to 'ndb/src/mgmsrv')
-rw-r--r--ndb/src/mgmsrv/MgmtSrvr.cpp6
-rw-r--r--ndb/src/mgmsrv/MgmtSrvr.hpp2
-rw-r--r--ndb/src/mgmsrv/Services.cpp4
3 files changed, 6 insertions, 6 deletions
diff --git a/ndb/src/mgmsrv/MgmtSrvr.cpp b/ndb/src/mgmsrv/MgmtSrvr.cpp
index 0de914d076c..42dc1070379 100644
--- a/ndb/src/mgmsrv/MgmtSrvr.cpp
+++ b/ndb/src/mgmsrv/MgmtSrvr.cpp
@@ -2849,7 +2849,7 @@ int
MgmtSrvr::getConnectionDbParameter(int node1,
int node2,
int param,
- unsigned *value,
+ int *value,
BaseString& msg){
DBUG_ENTER("MgmtSrvr::getConnectionDbParameter");
@@ -2874,12 +2874,12 @@ MgmtSrvr::getConnectionDbParameter(int node1,
return -1;
}
- if(iter.get(param, value) < 0) {
+ if(iter.get(param, (Uint32*)value) < 0) {
msg.assign("Unable to get current value of parameter");
return -1;
}
- msg.assfmt("%u",*value);
+ msg.assfmt("%d",*value);
DBUG_RETURN(1);
}
diff --git a/ndb/src/mgmsrv/MgmtSrvr.hpp b/ndb/src/mgmsrv/MgmtSrvr.hpp
index 450dbf15160..0d5f3f33b3c 100644
--- a/ndb/src/mgmsrv/MgmtSrvr.hpp
+++ b/ndb/src/mgmsrv/MgmtSrvr.hpp
@@ -510,7 +510,7 @@ public:
int setConnectionDbParameter(int node1, int node2, int param, int value,
BaseString& msg);
int getConnectionDbParameter(int node1, int node2, int param,
- unsigned *value, BaseString& msg);
+ int *value, BaseString& msg);
int set_connect_string(const char *str);
diff --git a/ndb/src/mgmsrv/Services.cpp b/ndb/src/mgmsrv/Services.cpp
index 447bc8bdc2b..a940b781865 100644
--- a/ndb/src/mgmsrv/Services.cpp
+++ b/ndb/src/mgmsrv/Services.cpp
@@ -1373,7 +1373,7 @@ void
MgmApiSession::getConnectionParameter(Parser_t::Context &ctx,
Properties const &args) {
BaseString node1, node2, param;
- unsigned value = 0;
+ int value = 0;
args.get("node1", node1);
args.get("node2", node2);
@@ -1387,7 +1387,7 @@ MgmApiSession::getConnectionParameter(Parser_t::Context &ctx,
result);
m_output->println("get connection parameter reply");
- m_output->println("value: %u", value);
+ m_output->println("value: %d", value);
m_output->println("result: %s", (ret>0)?"Ok":result.c_str());
m_output->println("");
}