bk commit into 5.1 tree (knielsen:1.2617)

[knielsen]

Below is the list of changes that have just been committed into a local
5.1 repository of knielsen.  When knielsen 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, 2008-05-30 08:33:02+02:00, knielsen@ymer.(none) +3 -0
  Solaris portability fix.

  storage/ndb/include/transporter/TransporterRegistry.hpp@stripped, 2008-05-30 08:32:58+02:00, knielsen@ymer.(none) +2 -2
    Solaris portability fix.

  storage/ndb/src/common/transporter/TransporterRegistry.cpp@stripped, 2008-05-30 08:32:58+02:00, knielsen@ymer.(none) +4 -4
    Solaris portability fix.

  storage/ndb/src/kernel/vm/mt.cpp@stripped, 2008-05-30 08:32:58+02:00, knielsen@ymer.(none) +2 -2
    Solaris portability fix.

diff -Nrup a/storage/ndb/include/transporter/TransporterRegistry.hpp b/storage/ndb/include/transporter/TransporterRegistry.hpp
--- a/storage/ndb/include/transporter/TransporterRegistry.hpp	2008-05-29 17:06:00 +02:00
+++ b/storage/ndb/include/transporter/TransporterRegistry.hpp	2008-05-30 08:32:58 +02:00
@@ -435,10 +435,10 @@ private:
   /* Send buffer pages. */
   struct SendBufferPage {
     /* This is the number of words that will fit in one page of send buffer. */
-    static const Uint32 PAGESIZE = 32768;
+    static const Uint32 PGSIZE = 32768;
     static Uint32 max_data_bytes()
     {
-      return PAGESIZE - offsetof(SendBufferPage, m_data);
+      return PGSIZE - offsetof(SendBufferPage, m_data);
     }
 
     /* Send buffer for one transporter is kept in a single-linked list. */
diff -Nrup a/storage/ndb/src/common/transporter/TransporterRegistry.cpp b/storage/ndb/src/common/transporter/TransporterRegistry.cpp
--- a/storage/ndb/src/common/transporter/TransporterRegistry.cpp	2008-05-29 17:06:02 +02:00
+++ b/storage/ndb/src/common/transporter/TransporterRegistry.cpp	2008-05-30 08:32:58 +02:00
@@ -155,16 +155,16 @@ TransporterRegistry::allocate_send_buffe
 
   /* Initialize the page freelist. */
   Uint32 send_buffer_pages =
-    (total_send_buffer + SendBufferPage::PAGESIZE - 1)/SendBufferPage::PAGESIZE;
+    (total_send_buffer + SendBufferPage::PGSIZE - 1)/SendBufferPage::PGSIZE;
   /* Add one extra page of internal fragmentation overhead per transporter. */
   send_buffer_pages += nTransporters;
 
   m_send_buffer_memory =
-    new unsigned char[send_buffer_pages * SendBufferPage::PAGESIZE];
+    new unsigned char[send_buffer_pages * SendBufferPage::PGSIZE];
   if (m_send_buffer_memory == NULL)
   {
     ndbout << "Unable to allocate "
-           << send_buffer_pages * SendBufferPage::PAGESIZE
+           << send_buffer_pages * SendBufferPage::PGSIZE
            << " bytes of memory for send buffers, aborting." << endl;
     abort();
   }
@@ -173,7 +173,7 @@ TransporterRegistry::allocate_send_buffe
   for (unsigned i = 0; i < send_buffer_pages; i++)
   {
     SendBufferPage *page =
-      (SendBufferPage *)(m_send_buffer_memory + i * SendBufferPage::PAGESIZE);
+      (SendBufferPage *)(m_send_buffer_memory + i * SendBufferPage::PGSIZE);
     page->m_bytes = 0;
     page->m_next = m_page_freelist;
     m_page_freelist = page;
diff -Nrup a/storage/ndb/src/kernel/vm/mt.cpp b/storage/ndb/src/kernel/vm/mt.cpp
--- a/storage/ndb/src/kernel/vm/mt.cpp	2008-05-29 17:06:04 +02:00
+++ b/storage/ndb/src/kernel/vm/mt.cpp	2008-05-30 08:32:58 +02:00
@@ -602,10 +602,10 @@ struct thr_send_buf : public Transporter
   struct page
   {
     /* This is the number of words that will fit in one page of send buffer. */
-    static const Uint32 PAGESIZE = 32768;
+    static const Uint32 PGSIZE = 32768;
     static Uint32 max_data_bytes()
     {
-      return PAGESIZE - offsetof(page, m_data);
+      return PGSIZE - offsetof(page, m_data);
     }
 
     /* Send buffer for one transporter is kept in a single-linked list. */