From: magnus.blaudd
Date: October 11 2012 1:33pm
Subject: bzr push into mysql-5.1-telco-7.0 branch (magnus.blaudd:4997 to 4998)
List-Archive: http://lists.mysql.com/commits/145018
Message-Id: <20121011133347.9432.85243.4998@localhost6.localdomain6>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 4998 magnus.blaudd@stripped	2012-10-11
      ndb_mgm
       - Pressing Ctrl-C on certain platforms causes NULL to be returned from
        'readline' and that should trigger a graceful exit of ndb_mgm

    modified:
      storage/ndb/src/mgmclient/CommandInterpreter.cpp
 4997 magnus.blaudd@stripped	2012-10-11 [merge]
      Merge

    modified:
      storage/ndb/tools/delete_all.cpp
      storage/ndb/tools/desc.cpp
      storage/ndb/tools/drop_index.cpp
      storage/ndb/tools/drop_tab.cpp
      storage/ndb/tools/listTables.cpp
      storage/ndb/tools/ndb_config.cpp
      storage/ndb/tools/ndbinfo_select_all.cpp
      storage/ndb/tools/restore/restore_main.cpp
      storage/ndb/tools/select_all.cpp
      storage/ndb/tools/select_count.cpp
      storage/ndb/tools/waiter.cpp
=== modified file 'storage/ndb/src/mgmclient/CommandInterpreter.cpp'
--- a/storage/ndb/src/mgmclient/CommandInterpreter.cpp	2011-10-21 08:59:23 +0000
+++ b/storage/ndb/src/mgmclient/CommandInterpreter.cpp	2012-10-11 13:08:20 +0000
@@ -1128,8 +1128,10 @@ CommandInterpreter::execute_impl(const c
   DBUG_PRINT("enter",("line='%s'", _line));
   m_error= 0;
 
-  if(_line == NULL) {
-    ndbout_c("ERROR: Internal error at %s:%d.", __FILE__, __LINE__);
+  if(_line == NULL)
+  {
+    // Pressing Ctrl-C on some platforms will cause 'readline' to
+    // to return NULL, handle it as graceful exit of ndb_mgm 
     m_error = -1;
     DBUG_RETURN(false); // Terminate gracefully
   }

No bundle (reason: useless for push emails).