summaryrefslogtreecommitdiff
path: root/storage
diff options
context:
space:
mode:
authorunknown <holyfoot/hf@mysql.com/hfmain.(none)>2007-04-30 01:06:16 +0500
committerunknown <holyfoot/hf@mysql.com/hfmain.(none)>2007-04-30 01:06:16 +0500
commitdd0382606da2c566cee4b757b74606de565169e7 (patch)
tree1d90cf93e8c202ecc62c5a77651847653b45a108 /storage
parentf7d5008455a26d10517b462ee90269a9a0ed6124 (diff)
downloadmariadb-git-dd0382606da2c566cee4b757b74606de565169e7.tar.gz
'no DBUG_RETURN' warning fixed
storage/ndb/src/mgmapi/mgmapi.cpp: DBUG_ENTER requires DBUG_CHECK_TIMEDOUT_RET
Diffstat (limited to 'storage')
-rw-r--r--storage/ndb/src/mgmapi/mgmapi.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/storage/ndb/src/mgmapi/mgmapi.cpp b/storage/ndb/src/mgmapi/mgmapi.cpp
index b1a555872eb..e7dc1d1d503 100644
--- a/storage/ndb/src/mgmapi/mgmapi.cpp
+++ b/storage/ndb/src/mgmapi/mgmapi.cpp
@@ -394,7 +394,7 @@ ndb_mgm_call(NdbMgmHandle handle, const ParserRow<ParserDummy> *command_reply,
}
out.println("");
- CHECK_TIMEDOUT_RET(handle, in, out, NULL);
+ DBUG_CHECK_TIMEDOUT_RET(handle, in, out, NULL);
Parser_t::Context ctx;
ParserDummy session(handle->socket);
@@ -403,7 +403,7 @@ ndb_mgm_call(NdbMgmHandle handle, const ParserRow<ParserDummy> *command_reply,
const Properties* p = parser.parse(ctx, session);
if (p == NULL){
if(!ndb_mgm_is_connected(handle)) {
- CHECK_TIMEDOUT_RET(handle, in, out, NULL);
+ DBUG_CHECK_TIMEDOUT_RET(handle, in, out, NULL);
DBUG_RETURN(NULL);
}
else
@@ -413,7 +413,7 @@ ndb_mgm_call(NdbMgmHandle handle, const ParserRow<ParserDummy> *command_reply,
|| ctx.m_status==Parser_t::NoLine)
{
ndb_mgm_disconnect(handle);
- CHECK_TIMEDOUT_RET(handle, in, out, NULL);
+ DBUG_CHECK_TIMEDOUT_RET(handle, in, out, NULL);
DBUG_RETURN(NULL);
}
/**
@@ -438,7 +438,7 @@ ndb_mgm_call(NdbMgmHandle handle, const ParserRow<ParserDummy> *command_reply,
if(p && (in.timedout() || out.timedout()))
delete p;
- CHECK_TIMEDOUT_RET(handle, in, out, NULL);
+ DBUG_CHECK_TIMEDOUT_RET(handle, in, out, NULL);
DBUG_RETURN(p);
}