mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-15 03:17:20 +02:00
Code Issues Projects Releases Packages Wiki Activity

'no DBUG_RETURN' warning fixed

Browse source 
storage/ndb/src/mgmapi/mgmapi.cpp:
  DBUG_ENTER requires DBUG_CHECK_TIMEDOUT_RET
This commit is contained in:
unknown 2007-04-30 01:06:16 +05:00
commit dd0382606d
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
storage/ndb/src/mgmapi/mgmapi.cpp
View file

@ -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);
}