bk commit into 5.1 tree (mikron:1.2438)

[mikael]

Below is the list of changes that have just been committed into a local
5.1 repository of mikron. When mikron does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-03-31 17:39:58+02:00, mikron@stripped +2 -0
  bug fixes

  storage/ndb/include/transporter/TransporterRegistry.hpp@stripped, 2007-03-31 17:39:56+02:00, mikron@stripped +1 -1
    bug fix

  storage/ndb/src/common/transporter/TransporterRegistry.cpp@stripped, 2007-03-31 17:39:56+02:00, mikron@stripped +7 -8
    bug fixes

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	mikron
# Host:	mikael-ronstr-ms-dator.local
# Root:	/Users/mikron/mysql_clones/wl3695

--- 1.34/storage/ndb/include/transporter/TransporterRegistry.hpp	2007-03-31 17:32:08 +02:00
+++ 1.35/storage/ndb/include/transporter/TransporterRegistry.hpp	2007-03-31 17:39:56 +02:00
@@ -314,7 +314,7 @@
   struct pollfd *m_poll_events;
   TCP_Transporter **the_poll_tcp_transporters;
   TCP_Transporter **m_trp_fired;
-  struct trp_sort *m_sort_trp_array;
+  struct trp_sort *m_trp_sort_array;
   Uint32 *m_trp_receive_stats;
   Uint8 *m_epoll_state;
   Uint16 *m_trp_id_from_fd;

--- 1.81/storage/ndb/src/common/transporter/TransporterRegistry.cpp	2007-03-31 17:11:03 +02:00
+++ 1.82/storage/ndb/src/common/transporter/TransporterRegistry.cpp	2007-03-31 17:39:56 +02:00
@@ -104,7 +104,7 @@
   m_poll_events             = new struct pollfd [maxTransporters];
   the_poll_tcp_transporters = new TCP_Transporter * [maxTransporters];
   m_trp_fired               = new TCP_Transporter * [maxTransporters];
-  m_sort_trp_array          = new struct trp_sort * [maxTransporters];
+  m_trp_sort_array          = new struct trp_sort [maxTransporters];
   m_epoll_state             = new Uint8[maxTransporters];
   m_trp_receive_stats       = new Uint32[maxTransporters];
   m_trp_id_from_fd          = new Uint16[MAX_EPOLL_FD];
@@ -113,7 +113,7 @@
   memset((char*)the_poll_tcp_transporters, 0,
          maxTransporters * sizeof(TCP_Transporter*));
   memset((char*)m_trp_fired, 0, maxTransporters * sizeof(TCP_Transporter*));
-  memset((char*)m_sort_trp_array, 0, maxTransporters * sizeof(struct trp_sort));
+  memset((char*)m_trp_sort_array, 0, maxTransporters * sizeof(struct trp_sort));
   memset(m_epoll_state, 0, maxTransporters * sizeof(Uint8));
   memset((char*)m_trp_receive_stats, 0, sizeof(Uint32) * maxTransporters);
   memset(m_trp_id_from_fd, 0xFF, sizeof(Uint16)*MAX_EPOLL_FD);
@@ -189,7 +189,7 @@
   delete [] m_poll_events;
   delete [] the_poll_tcp_transporters;
   delete [] m_trp_fired;
-  delete [] m_sort_trp_array;
+  delete [] m_trp_sort_array;
   delete [] m_epoll_state;
   delete [] m_trp_receive_stats;
   delete [] m_trp_id_from_fd;
@@ -1034,7 +1034,6 @@
   Uint32 trp_id, node_id, num_poll_events;
   TCP_Transporter *t;
   int sock_fd;
-  struct trp_sort sort_array[MAX_NTRANSPORTERS];
 
   for (i = 0; i < (Uint32)nTCPTransporters; i++)
   {
@@ -1047,19 +1046,19 @@
         list to slow down changes.
       */
       Uint32 add_factor = m_epoll_state[node_id];
-      sort_array[num_trps].trp_id = i;
-      sort_array[num_trps].trp_stats =
+      m_trp_sort_array[num_trps].trp_id = i;
+      m_trp_sort_array[num_trps].trp_stats =
         m_trp_receive_stats[node_id] + add_factor;
       num_trps++;
     }
   }
-  qsort((void*)&sort_array[0], num_trps, sizeof(struct trp_sort),
+  qsort((void*)m_trp_sort_array, num_trps, sizeof(struct trp_sort),
         trp_sort_compare);
   num_poll_events = num_trps > m_num_poll_events ?
                       m_num_poll_events : num_trps;
   for (i = 0; i < num_trps; i++)
   {
-    trp_id = sort_array[i].trp_id;
+    trp_id = m_trp_sort_array[i].trp_id;
     t = theTCPTransporters[trp_id];
     sock_fd = t->getSocket();
     node_id = t->getRemoteNodeId();