From: magnus.blaudd
Date: March 14 2012 9:21am
Subject: bzr push into mysql-5.1-telco-7.0 branch (magnus.blaudd:4885 to 4886)
List-Archive: http://lists.mysql.com/commits/143188
Message-Id: <201203140921.q2E9LJMm025287@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 4886 magnus.blaudd@stripped	2012-03-14
      ndb
       - add const to variable only assigned once

    modified:
      storage/ndb/src/common/transporter/TransporterRegistry.cpp
 4885 Jonas Oreland	2012-03-14
      ndb - bug#13824773 - fix restart with ndbmtd and tabledefinition being larger than 32k

    modified:
      storage/ndb/src/kernel/blocks/restore.cpp
      storage/ndb/src/kernel/blocks/restore.hpp
      storage/ndb/test/src/NDBT_Tables.cpp
=== modified file 'storage/ndb/src/common/transporter/TransporterRegistry.cpp'
--- a/storage/ndb/src/common/transporter/TransporterRegistry.cpp	2012-01-30 14:28:55 +0000
+++ b/storage/ndb/src/common/transporter/TransporterRegistry.cpp	2012-03-14 09:07:43 +0000
@@ -1257,7 +1257,7 @@ TransporterRegistry::poll_TCP(Uint32 tim
 
   recvdata.m_socket_poller.clear();
 
-  bool extra_socket = m_has_extra_wakeup_socket;
+  const bool extra_socket = m_has_extra_wakeup_socket;
   if (extra_socket && recvdata.m_transporters.get(0))
   {
     const NDB_SOCKET_TYPE socket = m_extra_wakeup_sockets[0];

No bundle (reason: useless for push emails).