mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-06 23:25:34 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge sama.ndb.mysql.com:/export/space/pekka/ndb/version/my50-ndb

Browse source 
into  sama.ndb.mysql.com:/export/space/pekka/ndb/version/my51-ndb


storage/ndb/src/common/debugger/SignalLoggerManager.cpp:
  Auto merged
storage/ndb/src/common/debugger/signaldata/ScanTab.cpp:
  Auto merged
storage/ndb/src/kernel/vm/pc.hpp:
  Auto merged
This commit is contained in:
unknown 2008-02-04 14:36:54 +01:00
commit 41c186e9c3
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
storage/ndb/src/common/debugger/SignalLoggerManager.cpp
View file

@ -129,7 +129,7 @@ SignalLoggerManager::log(LogMode logMode, const char * params)
const int count = getParameter(blocks, "BLOCK=", params); const int count = getParameter(blocks, "BLOCK=", params);
int cnt = 0; int cnt = 0;
if((count == 1 && blocks[0] == "ALL") || if((count == 1 && !strcmp(blocks[0], "ALL")) ||
count == 0){ count == 0){
for (int number = 0; number < NO_OF_BLOCKS; ++number){ for (int number = 0; number < NO_OF_BLOCKS; ++number){

2
storage/ndb/src/common/debugger/signaldata/ScanTab.cpp
View file

@ -70,7 +70,7 @@ printSCANTABCONF(FILE * output, const Uint32 * theData, Uint32 len, Uint16 recei
sig->transId1, sig->transId2); sig->transId1, sig->transId2);
fprintf(output, " requestInfo: Eod: %d OpCount: %d\n", fprintf(output, " requestInfo: Eod: %d OpCount: %d\n",
(requestInfo & ScanTabConf::EndOfData == ScanTabConf::EndOfData), (requestInfo & ScanTabConf::EndOfData) == ScanTabConf::EndOfData,
(requestInfo & (~ScanTabConf::EndOfData))); (requestInfo & (~ScanTabConf::EndOfData)));
size_t op_count= requestInfo & (~ScanTabConf::EndOfData); size_t op_count= requestInfo & (~ScanTabConf::EndOfData);
if(op_count){ if(op_count){

6
storage/ndb/src/kernel/vm/pc.hpp
View file

@ -49,7 +49,7 @@
theEmulatedJamBlockNumber = number(); \ theEmulatedJamBlockNumber = number(); \
Uint32 tEmulatedJamIndex = theEmulatedJamIndex; \ Uint32 tEmulatedJamIndex = theEmulatedJamIndex; \
*(Uint32*)(theEmulatedJam + tEmulatedJamIndex) = \ *(Uint32*)(theEmulatedJam + tEmulatedJamIndex) = \
((theEmulatedJamBlockNumber << 20) | line); \ ((theEmulatedJamBlockNumber << 20) | (line)); \
theEmulatedJamIndex = (tEmulatedJamIndex + 4) & JAM_MASK; } theEmulatedJamIndex = (tEmulatedJamIndex + 4) & JAM_MASK; }
#else #else
@ -72,7 +72,7 @@
theEmulatedJamBlockNumber = number(); \ theEmulatedJamBlockNumber = number(); \
Uint32 tEmulatedJamIndex = theEmulatedJamIndex; \ Uint32 tEmulatedJamIndex = theEmulatedJamIndex; \
*(Uint32*)((UintPtr)theEmulatedJam + (Uint32)tEmulatedJamIndex) = \ *(Uint32*)((UintPtr)theEmulatedJam + (Uint32)tEmulatedJamIndex) = \
((theEmulatedJamBlockNumber << 20) | line); \ ((theEmulatedJamBlockNumber << 20) | (line)); \
theEmulatedJamIndex = (tEmulatedJamIndex + 4) & JAM_MASK; } theEmulatedJamIndex = (tEmulatedJamIndex + 4) & JAM_MASK; }
#endif #endif
@ -231,6 +231,6 @@
#define MEMCOPY_PAGE(to, from, page_size_in_bytes) \ #define MEMCOPY_PAGE(to, from, page_size_in_bytes) \
memcpy((void*)(to), (void*)(from), (size_t)(page_size_in_bytes)); memcpy((void*)(to), (void*)(from), (size_t)(page_size_in_bytes));
#define MEMCOPY_NO_WORDS(to, from, no_of_words) \ #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));
#endif #endif