Commit eb9ce41a authored by unknown's avatar unknown
Browse files

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

storage/ndb/src/mgmsrv/InitConfigFileParser.cpp

+0 −1
Original line number Diff line number Diff line
@@ -853,7 +853,6 @@ InitConfigFileParser::parse_mycnf() 
    api = &options[idx+3];

  }

  

  

  Context ctx(m_info, m_errstream); 

  const char *groups[]= { "cluster_config", 0 };

  if (load_defaults(options, groups))