Merge

client/Makefile.am:
  Auto merged
client/mysqladmin.cc:
  Auto merged
configure.in:
  Auto merged
ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
ndb/src/mgmclient/ndb_mgmclient.hpp:
  Auto merged
ndb/src/mgmclient/ndb_mgmclient.h:
  Auto merged
ndb/tools/restore/restore_main.cpp:
  SCCS merged

1 files changed, 6 insertions, 1 deletions

diff --git a/ndb/src/mgmclient/CommandInterpreter.cpp b/ndb/src/mgmclient/CommandInterpreter.cpp
index 00e0a8c1919..54beaa49d3f 100644
--- a/ndb/src/mgmclient/CommandInterpreter.cpp
+++ b/ndb/src/mgmclient/CommandInterpreter.cpp
@@ -1374,7 +1374,7 @@ void
 CommandInterpreter::executeDumpState(int processId, const char* parameters,
 				     bool all) 
 {
-  if(parameters == 0 || strlen(parameters) == 0){
+  if(emptyString(parameters)){
     ndbout << "Expected argument" << endl;
     return;
   }
@@ -1794,6 +1794,10 @@ CommandInterpreter::executeEventReporting(int processId,
 					  const char* parameters, 
 					  bool all) 
 {
+  if (emptyString(parameters)) {
+    ndbout << "Expected argument" << endl;
+    return;
+  }
   connect();
 
   BaseString tmp(parameters);
@@ -1894,6 +1898,7 @@ void
 CommandInterpreter::executeAbortBackup(char* parameters) 
 {
   connect();
+
   strtok(parameters, " ");
   struct ndb_mgm_reply reply;
   char* id = strtok(NULL, "\0");