mirror of
https://github.com/MariaDB/server.git
synced 2025-01-30 02:30:06 +01:00
Bug #12043, do not core on misconfig unless debug compiled
This commit is contained in:
parent
fcc48eb337
commit
92e2b9edb1
1 changed files with 15 additions and 5 deletions
|
@ -2136,7 +2136,17 @@ const int ConfigInfo::m_NoOfParams = sizeof(m_ParamInfo) / sizeof(ParamInfo);
|
|||
/****************************************************************************
|
||||
* Ctor
|
||||
****************************************************************************/
|
||||
static void require(bool v) { if(!v) abort();}
|
||||
static void require(bool v)
|
||||
{
|
||||
if(!v)
|
||||
{
|
||||
#ifndef DBUG_OFF
|
||||
abort();
|
||||
#else
|
||||
exit(-1);
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
ConfigInfo::ConfigInfo()
|
||||
: m_info(true), m_systemDefaults(true)
|
||||
|
@ -2277,7 +2287,7 @@ ConfigInfo::ConfigInfo()
|
|||
****************************************************************************/
|
||||
inline void warning(const char * src, const char * arg){
|
||||
ndbout << "Illegal call to ConfigInfo::" << src << "() - " << arg << endl;
|
||||
abort();
|
||||
require(false);
|
||||
}
|
||||
|
||||
const Properties *
|
||||
|
@ -3394,7 +3404,7 @@ fixDepricated(InitConfigFileParser::Context & ctx, const char * data){
|
|||
}
|
||||
case PropertiesType_Properties:
|
||||
default:
|
||||
abort();
|
||||
::require(false);
|
||||
}
|
||||
}
|
||||
return true;
|
||||
|
@ -3406,7 +3416,7 @@ static bool
|
|||
saveInConfigValues(InitConfigFileParser::Context & ctx, const char * data){
|
||||
const Properties * sec;
|
||||
if(!ctx.m_currentInfo->get(ctx.fname, &sec)){
|
||||
abort();
|
||||
require(false);
|
||||
return false;
|
||||
}
|
||||
|
||||
|
@ -3477,7 +3487,7 @@ saveInConfigValues(InitConfigFileParser::Context & ctx, const char * data){
|
|||
break;
|
||||
}
|
||||
default:
|
||||
abort();
|
||||
require(false);
|
||||
}
|
||||
require(ok);
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue