bzr push into mysql-5.1-telco-7.1 branch (jonas.oreland:4271 to 4272)

[Jonas Oreland]

 4272 Jonas Oreland	2011-09-06 [merge]
      ndb - merge 70 to 71

    modified:
      storage/ndb/include/kernel/signaldata/TcKeyReq.hpp
 4271 Jonas Oreland	2011-09-06
      ndb - allow configure/cmake to use environment variable CLASSPATH if --with-classpath has not been provided

    modified:
      storage/ndb/ndb_configure.cmake
      storage/ndb/ndb_configure.m4
=== modified file 'storage/ndb/include/kernel/signaldata/TcKeyReq.hpp'
--- a/storage/ndb/include/kernel/signaldata/TcKeyReq.hpp	2011-06-30 15:59:25 +0000
+++ b/storage/ndb/include/kernel/signaldata/TcKeyReq.hpp	2011-09-05 17:12:17 +0000
@@ -174,6 +174,8 @@ private:
   static Uint8  getAIInTcKeyReq(const UintR & requestInfo);
   static UintR  getNoDiskFlag(const UintR & requestInfo);
 
+  static UintR getCoordinatedTransactionFlag(const UintR & requestInfo);
+
   /**
    * Get:ers for scanInfo
    */
@@ -204,7 +206,7 @@ private:
 
   static void setReorgFlag(UintR & requestInfo, UintR val);
   static UintR getReorgFlag(const UintR & requestInfo);
-
+  static void setCoordinatedTransactionFlag(UintR & requestInfo, UintR val);
   static void setQueueOnRedoProblemFlag(UintR & requestInfo, UintR val);
   static UintR getQueueOnRedoProblemFlag(const UintR & requestInfo);
 
@@ -243,13 +245,14 @@ private:
  y = Commit Type           - 2  Bit 12-13
  n = No disk flag          - 1  Bit 1
  r = reorg flag            - 1  Bit 19
+ x = Coordinated Tx flag   - 1  Bit 16
  q = Queue on redo problem - 1  Bit 9
  D = deferred constraint   - 1  Bit 17
 
            1111111111222222222233
  01234567890123456789012345678901
  dnb cooop lsyyeiaaarkkkkkkkkkkkk  (Short TCKEYREQ)
- dnbvcooopqlsyyei D r              (Long TCKEYREQ)
+ dnbvcooopqlsyyeixD r              (Long TCKEYREQ)
 */
 
 #define TCKEY_NODISK_SHIFT (1)
@@ -278,6 +281,7 @@ private:
 #define TC_REORG_SHIFT     (19)
 #define QUEUE_ON_REDO_SHIFT (9)
 
+#define TC_COORDINATED_SHIFT (16)
 #define TC_DEFERRED_CONSTAINTS_SHIFT (17)
 
 /**
@@ -376,6 +380,12 @@ TcKeyReq::getDistributionKeyFlag(const U
 }
 
 inline
+UintR
+TcKeyReq::getCoordinatedTransactionFlag(const UintR & requestInfo){
+  return (UintR)((requestInfo >> TC_COORDINATED_SHIFT) & 1);
+}
+
+inline
 Uint8
 TcKeyReq::getViaSPJFlag(const UintR & requestInfo){
   return (Uint8)((requestInfo >> VIA_SPJ_SHIFT) & 1);
@@ -476,6 +486,14 @@ TcKeyReq::setDistributionKeyFlag(UintR &
 }
 
 inline
+void
+TcKeyReq::setCoordinatedTransactionFlag(UintR & requestInfo, UintR flag){
+  ASSERT_BOOL(flag, "TcKeyReq::setCoordinatedTransactionFlag");
+  requestInfo &= ~(1 << TC_COORDINATED_SHIFT);
+  requestInfo |= (flag << TC_COORDINATED_SHIFT);
+}
+
+inline
 void 
 TcKeyReq::setViaSPJFlag(UintR & requestInfo, Uint32 flag){
   ASSERT_BOOL(flag, "TcKeyReq::setViaSPJFlag");
@@ -605,7 +623,7 @@ TcKeyReq::getReorgFlag(const UintR & req
 inline
 void
 TcKeyReq::setReorgFlag(UintR & requestInfo, Uint32 flag){
-  ASSERT_BOOL(flag, "TcKeyReq::setNoDiskFlag");
+  ASSERT_BOOL(flag, "TcKeyReq::setReorgFlag");
   requestInfo |= (flag << TC_REORG_SHIFT);
 }
 

No bundle (reason: useless for push emails).