Commit 12655063 authored by unknown's avatar unknown
Browse files

Merge jonas@perch:src/51-jonas 

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb


storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
parents 37d97b58 894ec16b

config/ac-macros/ha_ndbcluster.m4

+1 −1
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ AC_DEFUN([MYSQL_SETUP_NDBCLUSTER], [ 


  MAKE_BINARY_DISTRIBUTION_OPTIONS="$MAKE_BINARY_DISTRIBUTION_OPTIONS --with-ndbcluster"



  # CXXFLAGS="$CXXFLAGS \$(NDB_CXXFLAGS)"

  CXXFLAGS="$CXXFLAGS \$(NDB_CXXFLAGS)"

  if test "$have_ndb_debug" = "default"

  then

    have_ndb_debug=$with_debug

storage/ndb/include/kernel/signaldata/AccScan.hpp

+18 −0
Original line number Diff line number Diff line
@@ -67,6 +67,9 @@ private: 


  static Uint32 getNRScanFlag(const Uint32 & requestInfo);

  static void setNRScanFlag(Uint32 & requestInfo, Uint32 nr);



  static Uint32 getLcpScanFlag(const Uint32 & requestInfo);

  static void setLcpScanFlag(Uint32 & requestInfo, Uint32 nr);

};



/**
@@ -77,6 +80,7 @@ private: 
 * z = Descending (TUX)      - 1  Bit 6

 * d = No disk scan          - 1  Bit 7

 * n = Node recovery scan    - 1  Bit 8

 * c = LCP scan              - 1  Bit 9

 *

 *           1111111111222222222233

 * 01234567890123456789012345678901
@@ -88,6 +92,7 @@ private: 
#define AS_DESCENDING_SHIFT      (6)

#define AS_NO_DISK_SCAN          (7)

#define AS_NR_SCAN               (8)

#define AS_LCP_SCAN              (9)



inline 

Uint32
@@ -154,6 +159,19 @@ AccScanReq::setNRScanFlag(UintR & requestInfo, UintR val){ 
  requestInfo |= (val << AS_NR_SCAN);

}



inline

Uint32

AccScanReq::getLcpScanFlag(const Uint32 & requestInfo){

  return (requestInfo >> AS_LCP_SCAN) & 1;

}



inline

void

AccScanReq::setLcpScanFlag(UintR & requestInfo, UintR val){

  ASSERT_BOOL(val, "AccScanReq::setNoDiskScanFlag");

  requestInfo |= (val << AS_LCP_SCAN);

}



class AccScanConf {

  /**

   * Sender(s)

storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp

+1 −1
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ public: 
    TuxSetLogFlags = 12002,

    TuxMetaDataJunk = 12009,

    

    DumpTsman = 9000, 

    DumpTsman = 9002, 

    DumpLgman = 10000,

    DumpPgman = 11000

  };

storage/ndb/include/kernel/signaldata/ScanFrag.hpp

+19 −2
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ public: 
  static Uint32 getAttrLen(const Uint32 & requestInfo);

  static Uint32 getScanPrio(const Uint32 & requestInfo);

  static Uint32 getNoDiskFlag(const Uint32 & requestInfo);

  static Uint32 getLcpScanFlag(const Uint32 & requestInfo);



  static void setLockMode(Uint32 & requestInfo, Uint32 lockMode);

  static void setHoldLockFlag(Uint32 & requestInfo, Uint32 holdLock);
@@ -72,6 +73,7 @@ public: 
  static void setAttrLen(Uint32 & requestInfo, Uint32 attrLen);

  static void setScanPrio(Uint32& requestInfo, Uint32 prio);

  static void setNoDiskFlag(Uint32& requestInfo, Uint32 val);

  static void setLcpScanFlag(Uint32 & requestInfo, Uint32 val);

};



class KeyInfo20 {
@@ -198,6 +200,7 @@ public: 
 * Request Info

 *

 * a = Length of attrinfo    - 16 Bits (16-31)

 * c = LCP scan              - 1  Bit 3

 * d = No disk               - 1  Bit 4

 * l = Lock Mode             - 1  Bit 5

 * h = Hold lock             - 1  Bit 7
@@ -222,6 +225,7 @@ public: 
#define SF_RANGE_SCAN_SHIFT (6)

#define SF_DESCENDING_SHIFT (10)

#define SF_TUP_SCAN_SHIFT   (11)

#define SF_LCP_SCAN_SHIFT   (3)



#define SF_ATTR_LEN_SHIFT    (16)

#define SF_ATTR_LEN_MASK     (65535)
@@ -359,6 +363,19 @@ ScanFragReq::setNoDiskFlag(UintR & requestInfo, UintR val){ 
  requestInfo |= (val << SF_NO_DISK_SHIFT);

}



inline

Uint32

ScanFragReq::getLcpScanFlag(const Uint32 & requestInfo){

  return (requestInfo >> SF_LCP_SCAN_SHIFT) & 1;

}



inline

void

ScanFragReq::setLcpScanFlag(UintR & requestInfo, UintR val){

  ASSERT_BOOL(val, "ScanFragReq::setLcpScanFlag");

  requestInfo |= (val << SF_LCP_SCAN_SHIFT);

}



inline

Uint32

KeyInfo20::setScanInfo(Uint32 opNo, Uint32 scanNo){

storage/ndb/src/kernel/blocks/backup/Backup.cpp

+17 −13
Original line number Diff line number Diff line
@@ -2985,10 +2985,11 @@ Backup::parseTableDescription(Signal* signal, 
    if (disk)

    {

      /**

       * Remove all disk attributes, but add DISK_REF (8 bytes)

       * Remove all disk attributes

       */

      tabPtr.p->noOfAttributes -= (disk - 1);

      tabPtr.p->noOfAttributes -= disk;

      

      {

	AttributePtr attrPtr;

	ndbrequire(tabPtr.p->attributes.seize(attrPtr));
@@ -2999,6 +3000,8 @@ Backup::parseTableDescription(Signal* signal, 
	

	attrPtr.p->data.offset = tabPtr.p->sz_FixedAttributes;

	tabPtr.p->sz_FixedAttributes += sz32;

	tabPtr.p->noOfAttributes ++;

      }

    }

    

    {
@@ -3309,6 +3312,7 @@ Backup::execBACKUP_FRAGMENT_REQ(Signal* signal) 
      ScanFragReq::setScanPrio(req->requestInfo, 1);

      ScanFragReq::setTupScanFlag(req->requestInfo, 1);

      ScanFragReq::setNoDiskFlag(req->requestInfo, 1);

      ScanFragReq::setLcpScanFlag(req->requestInfo, 1);

    }

    req->transId1 = 0;

    req->transId2 = (BACKUP << 20) + (getOwnNodeId() << 8);