List:Commits« Previous MessageNext Message »
From:Jonas Oreland Date:June 10 2010 10:15am
Subject:bzr commit into mysql-5.1-telco-7.0 branch (jonas:3579)
View as plain text  
#At file:///home/jonas/src/telco-6.4/ based on revid:jonas@stripped

 3579 Jonas Oreland	2010-06-10
      ndb - forte/sparc fixes, 1) no c++-comments in c-files 2) make sentinel-page 64-bit aligned

    modified:
      storage/ndb/include/ndb_global.h
      storage/ndb/src/kernel/vm/mt.cpp
=== modified file 'storage/ndb/include/ndb_global.h'
--- a/storage/ndb/include/ndb_global.h	2009-12-04 05:53:03 +0000
+++ b/storage/ndb/include/ndb_global.h	2010-06-10 10:15:55 +0000
@@ -155,9 +155,9 @@ extern "C" {
 
 #ifndef STATIC_ASSERT
 #if defined VM_TRACE
-// Compile-time assert for use from procedure body
-// Zero length array not allowed in C
-// Add use of array to avoid compiler warning
+/* Compile-time assert for use from procedure body
+ * Zero length array not allowed in C
+ */ Add use of array to avoid compiler warning
 #define STATIC_ASSERT(expr) { char static_assert[(expr)? 1 : 0] = {'\0'}; if (static_assert[0]) {}; }
 #else
 #define STATIC_ASSERT(expr)
@@ -213,9 +213,9 @@ extern "C" {
 
 /*
  * require is like a normal assert, only it's always on (eg. in release)
-*/
+ */
 C_MODE_START
-// see below
+/** see below */
 typedef int(*RequirePrinter)(const char *fmt, ...);
 void require_failed(int exitcode, RequirePrinter p,
                     const char* expr, const char* file, int line);
@@ -224,7 +224,7 @@ C_MODE_END
 /*
  *  this allows for an exit() call if exitcode is not zero
  *  and takes a Printer to print the error
-*/
+ */
 #define require_exit_or_core_with_printer(v, exitcode, printer) \
   do { if (likely(!(!(v)))) break;                                    \
        require_failed((exitcode), (printer), #v, __FILE__, __LINE__); \

=== modified file 'storage/ndb/src/kernel/vm/mt.cpp'
--- a/storage/ndb/src/kernel/vm/mt.cpp	2010-01-05 15:18:43 +0000
+++ b/storage/ndb/src/kernel/vm/mt.cpp	2010-06-10 10:15:55 +0000
@@ -1656,7 +1656,7 @@ link_thread_send_buffers(thr_repository:
     wi[thr] = src[thr].m_write_index;
   }
 
-  Uint32 sentinel[thr_send_page::HEADER_SIZE];
+  Uint64 sentinel[thr_send_page::HEADER_SIZE >> 1];
   thr_send_page* sentinel_page = (thr_send_page*)sentinel;
   sentinel_page->m_next = 0;
 


Attachment: [text/bzr-bundle] bzr/jonas@mysql.com-20100610101555-i2gq6z91xdiezofv.bundle
Thread
bzr commit into mysql-5.1-telco-7.0 branch (jonas:3579)Jonas Oreland10 Jun