diff options
author | unknown <stewart@mysql.com> | 2005-01-07 12:05:56 +1100 |
---|---|---|
committer | unknown <stewart@mysql.com> | 2005-01-07 12:05:56 +1100 |
commit | 5de7459359fb6871c281624c693bf15f4765ca64 (patch) | |
tree | 44029873076e028099cb6316173d9624a422ac91 /ndb/src/mgmapi/mgmapi.cpp | |
parent | 85313326356cc3c859203425a907327ed8bafdcb (diff) | |
download | mariadb-git-5de7459359fb6871c281624c693bf15f4765ca64.tar.gz |
Along the road to a working Impl3 of WL2278.
ndb/src/common/transporter/TransporterRegistry.cpp:
Only try to get dynamic port number for TCP transporters.
ndb/src/mgmapi/mgmapi.cpp:
DBUG_RETURN in ndb_mgm_set_connection_int_parameter
Unique negative error codes for ndb_mgm_get_connection_int_parameter
ndb/src/mgmsrv/MgmtSrvr.cpp:
add MgmtSrvr::set_connect_string(const char *str)
ndb/src/mgmsrv/MgmtSrvr.hpp:
Add:
- prototype for set_connect_string
- get_config_retriever
ndb/src/mgmsrv/main.cpp:
Fake a connect string and connect back to ourselves.
This enables us to use mgmapi routines to get configuration information.
i.e. ndb_mgm_get_connection_int_parameter for getting dynamic port numbers to connect to.
Diffstat (limited to 'ndb/src/mgmapi/mgmapi.cpp')
-rw-r--r-- | ndb/src/mgmapi/mgmapi.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ndb/src/mgmapi/mgmapi.cpp b/ndb/src/mgmapi/mgmapi.cpp index 166bd45d48b..93ffeb8f2d3 100644 --- a/ndb/src/mgmapi/mgmapi.cpp +++ b/ndb/src/mgmapi/mgmapi.cpp @@ -2084,7 +2084,7 @@ ndb_mgm_set_connection_int_parameter(NdbMgmHandle handle, } while(0); delete prop; - return res; + DBUG_RETURN(res); } extern "C" @@ -2097,7 +2097,7 @@ ndb_mgm_get_connection_int_parameter(NdbMgmHandle handle, struct ndb_mgm_reply* mgmreply){ DBUG_ENTER("ndb_mgm_get_connection_int_parameter"); CHECK_HANDLE(handle, -1); - CHECK_CONNECTED(handle, -1); + CHECK_CONNECTED(handle, -2); Properties args; args.put("node1", node1); @@ -2113,7 +2113,7 @@ ndb_mgm_get_connection_int_parameter(NdbMgmHandle handle, const Properties *prop; prop = ndb_mgm_call(handle, reply, "get connection parameter", &args); - CHECK_REPLY(prop, -2); + CHECK_REPLY(prop, -3); int res= -1; do { @@ -2127,7 +2127,7 @@ ndb_mgm_get_connection_int_parameter(NdbMgmHandle handle, if(!prop->get("value",value)){ ndbout_c("Unable to get value"); - res = -3; + res = -4; } delete prop; |