removed compiler warning

shortened help text
parent 36a2a5e2
...@@ -104,24 +104,25 @@ const char *debug_option= 0; ...@@ -104,24 +104,25 @@ const char *debug_option= 0;
struct getargs args[] = { struct getargs args[] = {
{ "version", 'v', arg_flag, &_print_version, { "version", 'v', arg_flag, &_print_version,
"Print ndb_mgmd version"}, "Print ndb_mgmd version",""},
{ "config-file", 'c', arg_string, &glob.config_filename, { "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 #ifndef DBUG_OFF
{ "debug", 0, arg_string, &debug_option, { "debug", 0, arg_string, &debug_option,
"Specify debug options e.g. d:t:i:o,out.trace", "options" }, "Specify debug options e.g. d:t:i:o,out.trace", "options"},
#endif #endif
{ "daemon", 'd', arg_flag, &glob.daemon, { "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, { 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" }, "filename"},
{ "interactive", 0, arg_flag, &glob.interactive, { "interactive", 0, arg_flag, &glob.interactive,
"Run interactive. Not supported but provided for testing purposes", "" }, "Run interactive. Not supported but provided for testing purposes", ""},
{ "no-nodeid-checks", 0, arg_flag, &g_no_nodeid_checks, { "no-nodeid-checks", 0, arg_flag, &g_no_nodeid_checks,
"Do not provide any node id checks", "" }, "Do not provide any node id checks", ""},
{ "nodaemon", 0, arg_flag, &glob.non_interactive, { "nodaemon", 0, arg_flag, &glob.non_interactive,
"Don't run as daemon, but don't read from stdin", "non-interactive" } "Don't run as daemon, but don't read from stdin", "non-interactive"}
}; };
int num_args = sizeof(args) / sizeof(args[0]); int num_args = sizeof(args) / sizeof(args[0]);
......
...@@ -117,6 +117,11 @@ int main(int argc, const char** argv){ ...@@ -117,6 +117,11 @@ int main(int argc, const char** argv){
return NDBT_ProgramExit(NDBT_WRONGARGS); 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, if (scanReadRecords(&MyNdb,
pTab, pTab,
pIdx, pIdx,
...@@ -146,7 +151,7 @@ int scanReadRecords(Ndb* pNdb, ...@@ -146,7 +151,7 @@ int scanReadRecords(Ndb* pNdb,
int check; int check;
NdbConnection *pTrans; NdbConnection *pTrans;
NdbScanOperation *pOp; NdbScanOperation *pOp;
NdbIndexScanOperation * pIOp; NdbIndexScanOperation * pIOp= 0;
NDBT_ResultRow * row = new NDBT_ResultRow(*pTab, delimiter); NDBT_ResultRow * row = new NDBT_ResultRow(*pTab, delimiter);
......
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