Commit eb9ce41a authored by unknown's avatar unknown

Merge perch.ndb.mysql.com:/home/jonas/src/51-work

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


storage/ndb/src/mgmsrv/InitConfigFileParser.cpp:
  Auto merged
parents 24a20fbe 3b6dad3b
...@@ -853,7 +853,6 @@ InitConfigFileParser::parse_mycnf() ...@@ -853,7 +853,6 @@ InitConfigFileParser::parse_mycnf()
api = &options[idx+3]; api = &options[idx+3];
} }
Context ctx(m_info, m_errstream); Context ctx(m_info, m_errstream);
const char *groups[]= { "cluster_config", 0 }; const char *groups[]= { "cluster_config", 0 };
if (load_defaults(options, groups)) if (load_defaults(options, groups))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment