mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 03:52:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Bug#45611: Minor code cleanup

Browse source 
Remove a self assignment.
Rework a few constructs to avoid a potential overflow.

Based upon patch contributed by Michal Hrusecky

storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Remove self assignment, the object is being initialized.
storage/ndb/src/mgmsrv/InitConfigFileParser.cpp:
  Setup the string in a single snprintf.
This commit is contained in:
Davi Arnaut 2009-09-01 09:32:26 -03:00
parent 6bc9610022
commit 8c7c09cc63
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
View file

@ -7521,8 +7521,8 @@ void Dbdict::execGET_TABINFOREQ(Signal* signal)
return;
}
releaseSections(signal);
DictObject * old_ptr_p = old_ptr_p = get_object(tableName, len);
DictObject * old_ptr_p = get_object(tableName, len);
if(old_ptr_p)
obj_id = old_ptr_p->m_id;
} else {

7
storage/ndb/src/mgmsrv/InitConfigFileParser.cpp
View file

@ -208,11 +208,10 @@ InitConfigFileParser::run_config_rules(Context& ctx)
ctx.m_config->put("NoOfNodes", nNodes);
char tmpLine[MAX_LINE_LENGTH];
BaseString::snprintf(tmpLine, MAX_LINE_LENGTH, "EXTERNAL SYSTEM_");
strncat(tmpLine, system, MAX_LINE_LENGTH);
strncat(tmpLine, ":NoOfConnections", MAX_LINE_LENGTH);
BaseString::snprintf(tmpLine, MAX_LINE_LENGTH,
"EXTERNAL SYSTEM_%s:NoOfConnections", system);
ctx.m_config->put(tmpLine, nExtConnections);
Config * ret = new Config();
ret->m_configValues = (struct ndb_mgm_configuration*)ctx.m_configValues.getConfigValues();
ret->m_oldConfig = ctx.m_config; ctx.m_config = 0;