Commit fcc48eb3 authored by unknown's avatar unknown
Browse files

Bug#12833 corrected parsing of CLUSTERLOG command in ndb_mgm

parent 1e791cc5

ndb/src/mgmclient/CommandInterpreter.cpp

+42 −35
Original line number Diff line number Diff line
@@ -1909,11 +1909,16 @@ CommandInterpreter::executeEventReporting(int processId, 
    return;

  }

  BaseString tmp(parameters);

  Vector<BaseString> specs;

  tmp.split(specs, " ");



  for (int i=0; i < specs.size(); i++)

  {

    Vector<BaseString> spec;

  tmp.split(spec, "=");

    specs[i].split(spec, "=");

    if(spec.size() != 2){

    ndbout << "Invalid loglevel specification: " << parameters << endl;

    return;

      ndbout << "Invalid loglevel specification: " << specs[i] << endl;

      continue;

    }



    spec[0].trim().ndb_toupper();
@@ -1923,7 +1928,7 @@ CommandInterpreter::executeEventReporting(int processId, 
	 category < NDB_MGM_MIN_EVENT_CATEGORY ||

	 category > NDB_MGM_MAX_EVENT_CATEGORY){

	ndbout << "Unknown category: \"" << spec[0].c_str() << "\"" << endl;

      return;

	continue;

      }

    }
@@ -1931,10 +1936,11 @@ CommandInterpreter::executeEventReporting(int processId, 
    if (!convert(spec[1].c_str(),level))

    {

      ndbout << "Invalid level: " << spec[1].c_str() << endl;

    return;

      continue;

    }



  ndbout << "Executing CLUSTERLOG on node " << processId << flush;

    ndbout << "Executing CLUSTERLOG " << spec[0] << "=" << spec[1]

	   << " on node " << processId << flush;



    struct ndb_mgm_reply reply;

    int result;
@@ -1951,6 +1957,7 @@ CommandInterpreter::executeEventReporting(int processId, 
      ndbout_c(" OK!"); 

    }

  }

}



/*****************************************************************************

 * Backup