1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1

Browse Source 
into poseidon.(none):/home/tomas/mysql-4.1-clean
This commit is contained in:
tomas@poseidon.(none) 2004-08-24 21:13:31 +00:00
commit 4ca548bcc6
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ndb/src/common/mgmcommon/ConfigInfo.cpp
View File

@ -29,6 +29,8 @@
const ConfigInfo::AliasPair const ConfigInfo::AliasPair
ConfigInfo::m_sectionNameAliases[]={ ConfigInfo::m_sectionNameAliases[]={
{"API", "MYSQLD"}, {"API", "MYSQLD"},
{"DB", "NDBD"},
{"MGM", "NDB_MGMD"},
{0, 0} {0, 0}
}; };

6
ndb/src/common/mgmcommon/InitConfigFileParser.cpp
View File

@ -222,7 +222,7 @@ bool InitConfigFileParser::parseNameValuePair(Context& ctx, const char* line) {
char tmpLine[MAX_LINE_LENGTH]; char tmpLine[MAX_LINE_LENGTH];
char fname[MAX_LINE_LENGTH], rest[MAX_LINE_LENGTH]; char fname[MAX_LINE_LENGTH], rest[MAX_LINE_LENGTH];
char* t; char* t;
const char *separator_list[]= {":", "="}; const char *separator_list[]= {":", "=", 0};
const char *separator= 0; const char *separator= 0;
if (ctx.m_currentSection == NULL){ if (ctx.m_currentSection == NULL){
@ -235,7 +235,7 @@ bool InitConfigFileParser::parseNameValuePair(Context& ctx, const char* line) {
// ************************************* // *************************************
// Check if a separator exists in line // Check if a separator exists in line
// ************************************* // *************************************
for(int i= 0; i < sizeof(separator_list); i++) { for(int i= 0; separator_list[i] != 0; i++) {
if(strchr(tmpLine, separator_list[i][0])) { if(strchr(tmpLine, separator_list[i][0])) {
separator= separator_list[i]; separator= separator_list[i];
break; break;
@ -522,7 +522,7 @@ InitConfigFileParser::parseDefaultSectionHeader(const char* line) const {
if (no != 2) return NULL; if (no != 2) return NULL;
// Not correct keyword at end // Not correct keyword at end
if (!strcmp(token2, "DEFAULT") == 0) return NULL; if (!strcasecmp(token2, "DEFAULT") == 0) return NULL;
if(m_info->getInfo(token1)){ if(m_info->getInfo(token1)){
return strdup(token1); return strdup(token1);