bk commit into 5.0 tree (pekka:1.2595)

[pekka]

Below is the list of changes that have just been committed into a local
5.0 repository of pekka.  When pekka 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-02-04 13:46:35+01:00, pekka@stripped +3 -0
  ndb - some warnings, debug errors

  ndb/src/common/debugger/SignalLoggerManager.cpp@stripped, 2008-02-04 13:46:04+01:00, pekka@stripped +1 -1
    some warnings, debug errors

  ndb/src/common/debugger/signaldata/ScanTab.cpp@stripped, 2008-02-04 13:46:04+01:00, pekka@stripped +1 -1
    some warnings, debug errors

  ndb/src/kernel/vm/pc.hpp@stripped, 2008-02-04 13:46:04+01:00, pekka@stripped +3 -3
    some warnings, debug errors

diff -Nrup a/ndb/src/common/debugger/SignalLoggerManager.cpp b/ndb/src/common/debugger/SignalLoggerManager.cpp
--- a/ndb/src/common/debugger/SignalLoggerManager.cpp	2006-12-23 20:04:12 +01:00
+++ b/ndb/src/common/debugger/SignalLoggerManager.cpp	2008-02-04 13:46:04 +01:00
@@ -129,7 +129,7 @@ SignalLoggerManager::log(LogMode logMode
   const int count = getParameter(blocks, "BLOCK=", params);
   
   int cnt = 0;
-  if((count == 1 && blocks[0] == "ALL") ||
+  if((count == 1 && !strcmp(blocks[0], "ALL")) ||
      count == 0){
     
     for (int number = 0; number < NO_OF_BLOCKS; ++number){
diff -Nrup a/ndb/src/common/debugger/signaldata/ScanTab.cpp b/ndb/src/common/debugger/signaldata/ScanTab.cpp
--- a/ndb/src/common/debugger/signaldata/ScanTab.cpp	2006-12-23 20:04:12 +01:00
+++ b/ndb/src/common/debugger/signaldata/ScanTab.cpp	2008-02-04 13:46:04 +01:00
@@ -69,7 +69,7 @@ printSCANTABCONF(FILE * output, const Ui
 	  sig->transId1, sig->transId2);
 
   fprintf(output, " requestInfo: Eod: %d OpCount: %d\n", 
-	  (requestInfo & ScanTabConf::EndOfData == ScanTabConf::EndOfData),
+	  (requestInfo & ScanTabConf::EndOfData) == ScanTabConf::EndOfData,
 	  (requestInfo & (~ScanTabConf::EndOfData)));
   size_t op_count= requestInfo & (~ScanTabConf::EndOfData);
   if(op_count){
diff -Nrup a/ndb/src/kernel/vm/pc.hpp b/ndb/src/kernel/vm/pc.hpp
--- a/ndb/src/kernel/vm/pc.hpp	2006-12-23 20:04:17 +01:00
+++ b/ndb/src/kernel/vm/pc.hpp	2008-02-04 13:46:04 +01:00
@@ -49,7 +49,7 @@
   theEmulatedJamBlockNumber = number(); \
   Uint32 tEmulatedJamIndex = theEmulatedJamIndex; \
   *(Uint32*)(theEmulatedJam + tEmulatedJamIndex) = \
-    ((theEmulatedJamBlockNumber << 20) | line); \
+    ((theEmulatedJamBlockNumber << 20) | (line)); \
   theEmulatedJamIndex = (tEmulatedJamIndex + 4) & JAM_MASK; }
 
 #else
@@ -72,7 +72,7 @@
   theEmulatedJamBlockNumber = number(); \
   Uint32 tEmulatedJamIndex = theEmulatedJamIndex; \
   *(Uint32*)((UintPtr)theEmulatedJam + (Uint32)tEmulatedJamIndex) = \
-    ((theEmulatedJamBlockNumber << 20) | line); \
+    ((theEmulatedJamBlockNumber << 20) | (line)); \
   theEmulatedJamIndex = (tEmulatedJamIndex + 4) & JAM_MASK; }
 
 #endif
@@ -232,7 +232,7 @@
 #define MEMCOPY_PAGE(to, from, page_size_in_bytes) \
   memcpy((void*)(to), (void*)(from), (size_t)(page_size_in_bytes));
 #define MEMCOPY_NO_WORDS(to, from, no_of_words) \
-  memcpy((to), (void*)(from), (size_t)(no_of_words << 2));
+  memcpy((to), (void*)(from), (size_t)((no_of_words) << 2));
 
 template <class T>
 struct Ptr {