Commit cb365f99 authored by unknown's avatar unknown
Browse files

removed compiler warning 

shortened help text


ndb/tools/select_all.cpp:
  removed compiler warning
parent 3dee030f

ndb/src/mgmsrv/main.cpp

+10 −9
Original line number Diff line number Diff line
@@ -104,17 +104,18 @@ const char *debug_option= 0; 


struct getargs args[] = {

  { "version", 'v', arg_flag, &_print_version,

    "Print ndb_mgmd version"},

    "Print ndb_mgmd version",""},

  { "config-file", 'c', arg_string, &glob.config_filename,

    "Specify cluster configuration file (will default use config.ini if available)", "filename" },

    "Specify cluster configuration file (default config.ini if available)",

    "filename"},

#ifndef DBUG_OFF

  { "debug", 0, arg_string, &debug_option,

    "Specify debug options e.g. d:t:i:o,out.trace", "options"},

#endif

  { "daemon", 'd', arg_flag, &glob.daemon,

    "Run ndb_mgmd in daemon mode (default)" },

    "Run ndb_mgmd in daemon mode (default)",""},

  { NULL, 'l', arg_string, &glob.local_config_filename,

    "Specify configuration file connect string (will default use Ndb.cfg if available)",

    "Specify configuration file connect string (default Ndb.cfg if available)",

    "filename"},

  { "interactive", 0, arg_flag, &glob.interactive,

   "Run interactive. Not supported but provided for testing purposes", ""},

ndb/tools/select_all.cpp

+6 −1
Original line number Diff line number Diff line
@@ -117,6 +117,11 @@ int main(int argc, const char** argv){ 
    return NDBT_ProgramExit(NDBT_WRONGARGS);

  }

  

  if(_order && pIdx == NULL){

    ndbout << " Order flag given without an index" << endl;

    return NDBT_ProgramExit(NDBT_WRONGARGS);

  }



  if (scanReadRecords(&MyNdb, 

		      pTab, 

		      pIdx,
@@ -146,7 +151,7 @@ int scanReadRecords(Ndb* pNdb, 
  int                  check;

  NdbConnection	       *pTrans;

  NdbScanOperation	       *pOp;

  NdbIndexScanOperation * pIOp;

  NdbIndexScanOperation * pIOp= 0;



  NDBT_ResultRow * row = new NDBT_ResultRow(*pTab, delimiter);