bzr push into mysql-5.1-telco-7.0 branch (jonas:4292 to 4293)

[Jonas Oreland]

 4293 Jonas Oreland	2011-04-07
      ndb - fix rare ndb_mgmd core-dump on sol10-sparc-a due to trying to print a null-pointer. See in e.g ndb_alter_table_online

    modified:
      storage/ndb/src/mgmsrv/Services.cpp
 4292 Jonas Oreland	2011-04-07
      ndb - silence (by ugly casts) warnings due to changing return type of my_recv to ssize_t

    modified:
      storage/ndb/src/common/transporter/TCP_Transporter.cpp
      storage/ndb/src/common/transporter/TransporterRegistry.cpp
      storage/ndb/src/common/util/socket_io.cpp
=== modified file 'storage/ndb/src/mgmsrv/Services.cpp'
--- a/storage/ndb/src/mgmsrv/Services.cpp	2011-03-28 09:01:03 +0000
+++ b/storage/ndb/src/mgmsrv/Services.cpp	2011-04-07 10:55:42 +0000
@@ -430,11 +430,16 @@ MgmApiSession::runSession()
 
       if (msg){
         g_eventLogger->debug("%s: %s, '%s'",
-                             name(), msg, ctx.m_currentToken);
+                             name(),
+                             msg,
+                             ctx.m_currentToken != 0 ?
+                             ctx.m_currentToken : "<NULL>");
 
         // Send result to client
         m_output->println("result: %s, '%s'",
-                          msg, ctx.m_currentToken);
+                          msg,
+                          ctx.m_currentToken != 0 ?
+                          ctx.m_currentToken : "<NULL>");
         m_output->print("\n");
       }
     }

No bundle (reason: useless for push emails).