Commit 7d4bec62 authored by unknown's avatar unknown

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

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


storage/ndb/src/mgmsrv/InitConfigFileParser.cpp:
  merge
parents 9faaba0d 0d3877bb
...@@ -851,7 +851,6 @@ InitConfigFileParser::parse_mycnf() ...@@ -851,7 +851,6 @@ InitConfigFileParser::parse_mycnf()
mysqld = &options[idx+2]; mysqld = &options[idx+2];
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 };
......
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