From: Date: December 17 2008 9:45am
Subject: bzr push into mysql-5.1 branch (tomas.ulin:3176 to 3177)
List-Archive: http://lists.mysql.com/commits/62082
Message-Id: <20081217084533.0A30B5F0091@linux.local>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3177 Tomas Ulin	2008-12-17
      ndb_mgm segv if no params to create nodegroup
modified:
  storage/ndb/src/mgmclient/CommandInterpreter.cpp

 3176 Leonard Zhou	2008-12-17 [merge]
      Merge 63 to 64
modified:
  storage/ndb/src/mgmclient/CommandInterpreter.cpp
  storage/ndb/src/mgmsrv/MgmtSrvr.cpp
  storage/ndb/src/mgmsrv/MgmtSrvr.hpp
  storage/ndb/test/ndbapi/testSingleUserMode.cpp

=== modified file 'storage/ndb/src/mgmclient/CommandInterpreter.cpp'
--- a/storage/ndb/src/mgmclient/CommandInterpreter.cpp	2008-12-17 08:06:47 +0000
+++ b/storage/ndb/src/mgmclient/CommandInterpreter.cpp	2008-12-17 08:44:56 +0000
@@ -3169,12 +3169,13 @@ CommandInterpreter::executeCreateNodeGro
   int result;
   int ng;
   struct ndb_mgm_reply reply;
-  if (emptyString(parameters))
+  char *id= strchr(parameters, ' ');
+  if (emptyString(id))
     goto err;
 
   {
     Vector<int> nodes;
-    BaseString args(strchr(parameters, ' '));
+    BaseString args(id);
     Vector<BaseString> nodelist;
     args.split(nodelist, ",");