Commit 2ff4bc7e authored by unknown's avatar unknown
Browse files

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 

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

storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp

+1 −1
Original line number Diff line number Diff line
@@ -75,8 +75,8 @@ static BlockInfo ALL_BLOCKS[] = { 
  { DBTUP_REF,   1 ,  4000,  4007 },

  { DBDICT_REF,  1 ,  6000,  6003 },

  { NDBCNTR_REF, 0 ,  1000,  1999 },

  { CMVMI_REF,   1 ,  9000,  9999 }, // before QMGR

  { QMGR_REF,    1 ,     1,   999 },

  { CMVMI_REF,   1 ,  9000,  9999 },

  { TRIX_REF,    1 ,     0,     0 },

  { BACKUP_REF,  1 , 10000, 10999 },

  { DBUTIL_REF,  1 , 11000, 11999 },

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))