Merge

ndb/include/kernel/AttributeHeader.hpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
  Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
ndb/test/include/HugoOperations.hpp:
  Auto merged
ndb/test/ndbapi/testOIBasic.cpp:
  Auto merged
ndb/test/src/HugoOperations.cpp:
  Auto merged
ndb/test/src/HugoTransactions.cpp:
  Auto merged
ndb/test/src/UtilTransactions.cpp:
  Auto merged
ndb/tools/select_count.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
ndb/include/ndbapi/NdbDictionary.hpp:
  SCCS merged
ndb/src/ndbapi/NdbDictionary.cpp:
  SCCS merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  SCCS merged

5 files changed, 113 insertions, 150 deletions

diff --git a/ndb/src/kernel/blocks/dbtup/Dbtup.hpp b/ndb/src/kernel/blocks/dbtup/Dbtup.hpp
index 1c7662c5d55..6d169d20d16 100644
--- a/ndb/src/kernel/blocks/dbtup/Dbtup.hpp
+++ b/ndb/src/kernel/blocks/dbtup/Dbtup.hpp
@@ -207,6 +207,8 @@
 #define ZTUPLE_DELETED_ERROR 626
 #define ZINSERT_ERROR 630
 
+#define ZINVALID_CHAR_FORMAT 744
+
 
           /* SOME WORD POSITIONS OF FIELDS IN SOME HEADERS */
 #define ZPAGE_STATE_POS 0                 /* POSITION OF PAGE STATE            */
@@ -1020,14 +1022,14 @@ public:
    * for md5 summing and when returning keyinfo.  Returns number of
    * words or negative (-terrorCode) on error.
    */
-  int tuxReadPk(Uint32 fragPtrI, Uint32 pageId, Uint32 pageOffset, Uint32* dataOut);
+  int tuxReadPk(Uint32 fragPtrI, Uint32 pageId, Uint32 pageOffset, Uint32* dataOut, bool xfrmFlag);
 
   /*
    * ACC reads primary key without headers into an array of words.  At
    * this point in ACC deconstruction, ACC still uses logical references
    * to fragment and tuple.
    */
-  int accReadPk(Uint32 tableId, Uint32 fragId, Uint32 fragPageId, Uint32 pageIndex, Uint32* dataOut);
+  int accReadPk(Uint32 tableId, Uint32 fragId, Uint32 fragPageId, Uint32 pageIndex, Uint32* dataOut, bool xfrmFlag);
 
   /*
    * TUX checks if tuple is visible to scan.
@@ -1637,20 +1639,6 @@ private:
   bool readBitsNotNULL(Uint32* outBuffer, AttributeHeader*, Uint32, Uint32);
   bool updateBitsNotNULL(Uint32* inBuffer, Uint32, Uint32);
 
-// *****************************************************************
-// Read char routines optionally (tXfrmFlag) apply strxfrm
-// *****************************************************************
-
-  bool readCharNotNULL(Uint32* outBuffer,
-                       AttributeHeader* ahOut,
-                       Uint32  attrDescriptor,
-                       Uint32  attrDes2);
-
-  bool readCharNULLable(Uint32* outBuffer,
-                        AttributeHeader* ahOut,
-                        Uint32  attrDescriptor,
-                        Uint32  attrDes2);
-
 //------------------------------------------------------------------
 //------------------------------------------------------------------
   bool nullFlagCheck(Uint32  attrDes2);
diff --git a/ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp b/ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp
index 3b0ba1c196f..ab6e0642e11 100644
--- a/ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp
+++ b/ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp
@@ -173,7 +173,7 @@ Dbtup::tuxReadAttrs(Uint32 fragPtrI, Uint32 pageId, Uint32 pageOffset, Uint32 tu
 }
 
 int
-Dbtup::tuxReadPk(Uint32 fragPtrI, Uint32 pageId, Uint32 pageOffset, Uint32* dataOut)
+Dbtup::tuxReadPk(Uint32 fragPtrI, Uint32 pageId, Uint32 pageOffset, Uint32* dataOut, bool xfrmFlag)
 {
   ljamEntry();
   // use own variables instead of globals
@@ -200,7 +200,7 @@ Dbtup::tuxReadPk(Uint32 fragPtrI, Uint32 pageId, Uint32 pageOffset, Uint32* data
   operPtr.i = RNIL;
   operPtr.p = NULL;
   // do it
-  int ret = readAttributes(pagePtr.p, pageOffset, attrIds, numAttrs, dataOut, ZNIL, true);
+  int ret = readAttributes(pagePtr.p, pageOffset, attrIds, numAttrs, dataOut, ZNIL, xfrmFlag);
   // restore globals
   tabptr = tabptr_old;
   fragptr = fragptr_old;
@@ -229,7 +229,7 @@ Dbtup::tuxReadPk(Uint32 fragPtrI, Uint32 pageId, Uint32 pageOffset, Uint32* data
 }
 
 int
-Dbtup::accReadPk(Uint32 tableId, Uint32 fragId, Uint32 fragPageId, Uint32 pageIndex, Uint32* dataOut)
+Dbtup::accReadPk(Uint32 tableId, Uint32 fragId, Uint32 fragPageId, Uint32 pageIndex, Uint32* dataOut, bool xfrmFlag)
 {
   ljamEntry();
   // get table
@@ -245,7 +245,7 @@ Dbtup::accReadPk(Uint32 tableId, Uint32 fragId, Uint32 fragPageId, Uint32 pageIn
   ndbrequire((pageIndex & 0x1) == 0);
   Uint32 pageOffset = ZPAGE_HEADER_SIZE + (pageIndex >> 1) * tablePtr.p->tupheadsize;
   // use TUX routine - optimize later
-  int ret = tuxReadPk(fragPtr.i, pageId, pageOffset, dataOut);
+  int ret = tuxReadPk(fragPtr.i, pageId, pageOffset, dataOut, xfrmFlag);
   return ret;
 }
 
diff --git a/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp b/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp
index fc27cca9cda..13593602abc 100644
--- a/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp
+++ b/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp
@@ -311,6 +311,7 @@ void Dbtup::execTUP_ADD_ATTRREQ(Signal* signal)
     setTabDescrWord(firstTabDesIndex, attrDescriptor);
     Uint32 attrLen = AttributeDescriptor::getSize(attrDescriptor);
     Uint32 nullBitPos = fragOperPtr.p->currNullBit;
+    Uint32 bitCount = 0;
 
     if (AttributeDescriptor::getNullable(attrDescriptor)) {
       if (!AttributeDescriptor::getDynamic(attrDescriptor)) {
@@ -342,27 +343,29 @@ void Dbtup::execTUP_ADD_ATTRREQ(Signal* signal)
 	else
 	{
 	  ljam();
-	  Uint32 bitCount = AttributeDescriptor::getArraySize(attrDescriptor);
+	  bitCount = AttributeDescriptor::getArraySize(attrDescriptor);
 	  fragOperPtr.p->currNullBit += bitCount;
+	  break;
 	}
       }
       default:
         ndbrequire(false);
         break;
       }//switch
+      if(nullBitPos + bitCount + 1 >= MAX_NULL_BITS)
+      {
+	terrorCode = TupAddAttrRef::TooManyBitsUsed;
+        addattrrefuseLab(signal, regFragPtr, fragOperPtr, regTabPtr.p, fragId);
+	return;
+      }
       AttributeOffset::setOffset(attrDes2, attributePos);
       AttributeOffset::setNullFlagPos(attrDes2, nullBitPos);
     } else {
       ndbrequire(false);
     }//if
     if (csNumber != 0) { 
-      CHARSET_INFO* cs = get_charset(csNumber, MYF(0));
-      if (cs == NULL) {
-        ljam();
-        terrorCode = TupAddAttrRef::InvalidCharset;
-        addattrrefuseLab(signal, regFragPtr, fragOperPtr, regTabPtr.p, fragId);
-        return;
-      }
+      CHARSET_INFO* cs = all_charsets[csNumber];
+      ndbrequire(cs != NULL);
       Uint32 i = 0;
       while (i < fragOperPtr.p->charsetIndex) {
         ljam();
diff --git a/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp b/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp
index 60da2797f60..3c25e675a5e 100644
--- a/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp
+++ b/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp
@@ -59,10 +59,11 @@ Dbtup::setUpQueryRoutines(Tablerec* const regTabPtr)
           } else {
             ndbrequire(false);
           }//if
-          // replace read function of char attribute
+          // replace functions for char attribute
           if (AttributeOffset::getCharsetFlag(attrOffset)) {
             ljam();
-            regTabPtr->readFunctionArray[i] = &Dbtup::readCharNotNULL;
+            regTabPtr->readFunctionArray[i] = &Dbtup::readFixedSizeTHManyWordNotNULL;
+            regTabPtr->updateFunctionArray[i] = &Dbtup::updateFixedSizeTHManyWordNotNULL;
           }
         } else {
 	  if (AttributeDescriptor::getSize(attrDescriptor) == 0){
@@ -86,10 +87,11 @@ Dbtup::setUpQueryRoutines(Tablerec* const regTabPtr)
             regTabPtr->readFunctionArray[i] = &Dbtup::readFixedSizeTHZeroWordNULLable;
             regTabPtr->updateFunctionArray[i] = &Dbtup::updateFixedSizeTHManyWordNULLable;
           }//if
-          // replace read function of char attribute
+          // replace functions for char attribute
           if (AttributeOffset::getCharsetFlag(attrOffset)) {
             ljam();
-            regTabPtr->readFunctionArray[i] = &Dbtup::readCharNULLable;
+            regTabPtr->readFunctionArray[i] = &Dbtup::readFixedSizeTHManyWordNULLable;
+            regTabPtr->updateFunctionArray[i] = &Dbtup::updateFixedSizeTHManyWordNULLable;
           }
         }//if
       } else if (AttributeDescriptor::getArrayType(attrDescriptor) == ZVAR_ARRAY) {
@@ -337,25 +339,68 @@ Dbtup::readFixedSizeTHManyWordNotNULL(Uint32* outBuffer,
                                       Uint32  attrDes2)
 {
   Uint32 indexBuf = tOutBufIndex;
+  Uint32 charsetFlag = AttributeOffset::getCharsetFlag(attrDes2);
   Uint32 readOffset = AttributeOffset::getOffset(attrDes2);
   Uint32 attrNoOfWords = AttributeDescriptor::getSizeInWords(attrDescriptor);
-  Uint32 newIndexBuf = indexBuf + attrNoOfWords;
   Uint32 maxRead = tMaxRead;
 
   ndbrequire((readOffset + attrNoOfWords - 1) < tCheckOffset);
-  if (newIndexBuf <= maxRead) {
-    ljam();
-    ahOut->setDataSize(attrNoOfWords);
-    MEMCOPY_NO_WORDS(&outBuffer[indexBuf],
-                     &tTupleHeader[readOffset],
-                     attrNoOfWords);
-    tOutBufIndex = newIndexBuf;
-    return true;
+  if (! charsetFlag || ! tXfrmFlag) {
+    Uint32 newIndexBuf = indexBuf + attrNoOfWords;
+    if (newIndexBuf <= maxRead) {
+      ljam();
+      ahOut->setDataSize(attrNoOfWords);
+      MEMCOPY_NO_WORDS(&outBuffer[indexBuf],
+                       &tTupleHeader[readOffset],
+                       attrNoOfWords);
+      tOutBufIndex = newIndexBuf;
+      return true;
+    } else {
+      ljam();
+      terrorCode = ZTRY_TO_READ_TOO_MUCH_ERROR;
+    }//if
   } else {
     ljam();
-    terrorCode = ZTRY_TO_READ_TOO_MUCH_ERROR;
-    return false;
-  }//if
+    Tablerec* regTabPtr = tabptr.p;
+    Uint32 srcBytes = AttributeDescriptor::getSizeInBytes(attrDescriptor);
+    Uint32 i = AttributeOffset::getCharsetPos(attrDes2);
+    ndbrequire(i < regTabPtr->noOfCharsets);
+    CHARSET_INFO* cs = regTabPtr->charsetArray[i];
+    Uint32 xmul = cs->strxfrm_multiply;
+    if (xmul == 0)
+      xmul = 1;
+    Uint32 dstLen = xmul * srcBytes;
+    Uint32 maxIndexBuf = indexBuf + (dstLen >> 2);
+    if (maxIndexBuf <= maxRead) {
+      ljam();
+      uchar* dstPtr = (uchar*)&outBuffer[indexBuf];
+      const uchar* srcPtr = (uchar*)&tTupleHeader[readOffset];
+      const char* ssrcPtr = (const char*)srcPtr;
+      // could verify data format optionally
+      if (true ||
+          (*cs->cset->well_formed_len)(cs, ssrcPtr, ssrcPtr + srcBytes, ZNIL) == srcBytes) {
+        ljam();
+        // normalize
+        Uint32 n = (*cs->coll->strnxfrm)(cs, dstPtr, dstLen, srcPtr, srcBytes);
+        while ((n & 3) != 0) {
+          dstPtr[n++] = 0;
+        }
+        Uint32 dstWords = (n >> 2);
+        ahOut->setDataSize(dstWords);
+        Uint32 newIndexBuf = indexBuf + dstWords;
+        ndbrequire(newIndexBuf <= maxRead);
+        tOutBufIndex = newIndexBuf;
+        return true;
+      } else {
+        ljam();
+        terrorCode = ZTUPLE_CORRUPTED_ERROR;
+      }
+    } else {
+      ljam();
+      terrorCode = ZTRY_TO_READ_TOO_MUCH_ERROR;
+    }
+  }
+  return false;
 }//Dbtup::readFixedSizeTHManyWordNotNULL()
 
 bool
@@ -402,7 +447,6 @@ Dbtup::readFixedSizeTHManyWordNULLable(Uint32* outBuffer,
                                        Uint32  attrDescriptor,
                                        Uint32  attrDes2)
 {
-ljam();
   if (!nullFlagCheck(attrDes2)) {
     ljam();
     return readFixedSizeTHManyWordNotNULL(outBuffer,
@@ -563,74 +607,6 @@ Dbtup::readDynSmallVarSize(Uint32* outBuffer,
   return false;
 }//Dbtup::readDynSmallVarSize()
 
-
-bool
-Dbtup::readCharNotNULL(Uint32* outBuffer,
-                       AttributeHeader* ahOut,
-                       Uint32  attrDescriptor,
-                       Uint32  attrDes2)
-{
-  Uint32 indexBuf = tOutBufIndex;
-  Uint32 readOffset = AttributeOffset::getOffset(attrDes2);
-  Uint32 attrNoOfWords = AttributeDescriptor::getSizeInWords(attrDescriptor);
-  Uint32 newIndexBuf = indexBuf + attrNoOfWords;
-  Uint32 maxRead = tMaxRead;
-
-  ndbrequire((readOffset + attrNoOfWords - 1) < tCheckOffset);
-  if (newIndexBuf <= maxRead) {
-    ljam();
-    ahOut->setDataSize(attrNoOfWords);
-    if (! tXfrmFlag) {
-      MEMCOPY_NO_WORDS(&outBuffer[indexBuf],
-                       &tTupleHeader[readOffset],
-                       attrNoOfWords);
-    } else {
-      ljam();
-      Tablerec* regTabPtr = tabptr.p;
-      Uint32 i = AttributeOffset::getCharsetPos(attrDes2);
-      ndbrequire(i < tabptr.p->noOfCharsets);
-      // not const in MySQL
-      CHARSET_INFO* cs = tabptr.p->charsetArray[i];
-      // XXX should strip Uint32 null padding
-      const unsigned nBytes = attrNoOfWords << 2;
-      unsigned n =
-      (*cs->coll->strnxfrm)(cs,
-                            (uchar*)&outBuffer[indexBuf],
-                            nBytes,
-                            (const uchar*)&tTupleHeader[readOffset],
-                            nBytes);
-      // pad with ascii spaces
-      while (n < nBytes)
-        ((uchar*)&outBuffer[indexBuf])[n++] = 0x20;
-    }
-    tOutBufIndex = newIndexBuf;
-    return true;
-  } else {
-    ljam();
-    terrorCode = ZTRY_TO_READ_TOO_MUCH_ERROR;
-    return false;
-  }
-}
-
-bool
-Dbtup::readCharNULLable(Uint32* outBuffer,
-                       AttributeHeader* ahOut,
-                       Uint32  attrDescriptor,
-                       Uint32  attrDes2)
-{
-  if (!nullFlagCheck(attrDes2)) {
-    ljam();
-    return readCharNotNULL(outBuffer,
-                           ahOut,
-                           attrDescriptor,
-                           attrDes2);
-  } else {
-    ljam();
-    ahOut->setNULL();
-    return true;
-  }
-}
-
 /* ---------------------------------------------------------------------- */
 /*       THIS ROUTINE IS USED TO UPDATE A NUMBER OF ATTRIBUTES. IT IS     */
 /*       USED BY THE INSERT ROUTINE, THE UPDATE ROUTINE AND IT CAN BE     */
@@ -818,6 +794,7 @@ Dbtup::updateFixedSizeTHManyWordNotNULL(Uint32* inBuffer,
   Uint32 indexBuf = tInBufIndex;
   Uint32 inBufLen = tInBufLen;
   Uint32 updateOffset = AttributeOffset::getOffset(attrDes2);
+  Uint32 charsetFlag = AttributeOffset::getCharsetFlag(attrDes2);
   AttributeHeader ahIn(inBuffer[indexBuf]);
   Uint32 nullIndicator = ahIn.isNULL();
   Uint32 noOfWords = AttributeDescriptor::getSizeInWords(attrDescriptor);
@@ -827,6 +804,21 @@ Dbtup::updateFixedSizeTHManyWordNotNULL(Uint32* inBuffer,
   if (newIndex <= inBufLen) {
     if (!nullIndicator) {
       ljam();
+      if (charsetFlag) {
+        ljam();
+        Tablerec* regTabPtr = tabptr.p;
+        Uint32 bytes = AttributeDescriptor::getSizeInBytes(attrDescriptor);
+        Uint32 i = AttributeOffset::getCharsetPos(attrDes2);
+        ndbrequire(i < regTabPtr->noOfCharsets);
+        // not const in MySQL
+        CHARSET_INFO* cs = regTabPtr->charsetArray[i];
+        const char* ssrc = (const char*)&inBuffer[tInBufIndex + 1];
+        if ((*cs->cset->well_formed_len)(cs, ssrc, ssrc + bytes, ZNIL) != bytes) {
+          ljam();
+          terrorCode = ZINVALID_CHAR_FORMAT;
+          return false;
+        }
+      }
       tInBufIndex = newIndex;
       MEMCOPY_NO_WORDS(&tTupleHeader[updateOffset],
                        &inBuffer[indexBuf + 1],
@@ -1000,11 +992,14 @@ Dbtup::read_psuedo(Uint32 attrId, Uint32* outBuffer){
   case AttributeHeader::FRAGMENT:
     * outBuffer = operPtr.p->fragId >> 1; // remove "hash" bit
     return 1;
+  case AttributeHeader::ROW_SIZE:
+    * outBuffer = tabptr.p->tupheadsize << 2;
+    return 1;
   case AttributeHeader::ROW_COUNT:
   case AttributeHeader::COMMIT_COUNT:
     signal->theData[0] = operPtr.p->userpointer;
     signal->theData[1] = attrId;
-
+    
     EXECUTE_DIRECT(DBLQH, GSN_READ_PSUEDO_REQ, signal, 2);
     outBuffer[0] = signal->theData[0];
     outBuffer[1] = signal->theData[1];
@@ -1028,14 +1023,8 @@ Dbtup::readBitsNotNULL(Uint32* outBuffer,
 		       Uint32  attrDes2)
 {
   Tablerec* const regTabPtr = tabptr.p;
+  Uint32 pos = AttributeOffset::getNullFlagPos(attrDes2);
   Uint32 bitCount = AttributeDescriptor::getArraySize(attrDescriptor);
-  Uint32 offsetInTuple = AttributeOffset::getNullFlagOffset(attrDes2);
-  Uint32 offsetInWord = AttributeOffset::getNullFlagBitOffset(attrDes2);
-  ndbrequire(offsetInTuple < regTabPtr->tupNullWords);
-  offsetInTuple += regTabPtr->tupNullIndex;
-  ndbrequire(offsetInTuple < tCheckOffset);
-
-  Uint32 pos = offsetInTuple << 5 + offsetInWord;
   Uint32 indexBuf = tOutBufIndex;
   Uint32 newIndexBuf = indexBuf + ((bitCount + 31) >> 5);
   Uint32 maxRead = tMaxRead;
@@ -1066,17 +1055,12 @@ Dbtup::readBitsNULLable(Uint32* outBuffer,
 			Uint32  attrDes2)
 {
   Tablerec* const regTabPtr = tabptr.p;
+  Uint32 pos = AttributeOffset::getNullFlagPos(attrDes2);
   Uint32 bitCount = AttributeDescriptor::getArraySize(attrDescriptor);
-  Uint32 offsetInTuple = AttributeOffset::getNullFlagOffset(attrDes2);
-  Uint32 offsetInWord = AttributeOffset::getNullFlagBitOffset(attrDes2);
-  ndbrequire(offsetInTuple < regTabPtr->tupNullWords);
-  offsetInTuple += regTabPtr->tupNullIndex;
-  ndbrequire(offsetInTuple < tCheckOffset);
-
+  
   Uint32 indexBuf = tOutBufIndex;
-  Uint32 newIndexBuf = indexBuf + (bitCount + 31) >> 5;
+  Uint32 newIndexBuf = indexBuf + ((bitCount + 31) >> 5);
   Uint32 maxRead = tMaxRead;
-  Uint32 pos = offsetInWord << 5 + offsetInTuple;
   
   if(BitmaskImpl::get(regTabPtr->tupNullWords,
 		      tTupleHeader+regTabPtr->tupNullIndex,
@@ -1115,15 +1099,9 @@ Dbtup::updateBitsNotNULL(Uint32* inBuffer,
   Uint32 inBufLen = tInBufLen;
   AttributeHeader ahIn(inBuffer[indexBuf]);
   Uint32 nullIndicator = ahIn.isNULL();
+  Uint32 pos = AttributeOffset::getNullFlagPos(attrDes2);
   Uint32 bitCount = AttributeDescriptor::getArraySize(attrDescriptor);
   Uint32 newIndex = indexBuf + 1 + ((bitCount + 31) >> 5);
-  Uint32 nullFlagOffset = AttributeOffset::getNullFlagOffset(attrDes2);
-  Uint32 nullFlagBitOffset = AttributeOffset::getNullFlagBitOffset(attrDes2);
-  Uint32 nullWordOffset = nullFlagOffset + regTabPtr->tupNullIndex;
-  ndbrequire((nullFlagOffset < regTabPtr->tupNullWords) &&
-             (nullWordOffset < tCheckOffset));
-  Uint32 nullBits = tTupleHeader[nullWordOffset];
-  Uint32 pos = (nullFlagOffset << 5) + nullFlagBitOffset;
   
   if (newIndex <= inBufLen) {
     if (!nullIndicator) {
@@ -1156,15 +1134,9 @@ Dbtup::updateBitsNULLable(Uint32* inBuffer,
   AttributeHeader ahIn(inBuffer[tInBufIndex]);
   Uint32 indexBuf = tInBufIndex;
   Uint32 nullIndicator = ahIn.isNULL();
-  Uint32 nullFlagOffset = AttributeOffset::getNullFlagOffset(attrDes2);
-  Uint32 nullFlagBitOffset = AttributeOffset::getNullFlagBitOffset(attrDes2);
-  Uint32 nullWordOffset = nullFlagOffset + regTabPtr->tupNullIndex;
-  ndbrequire((nullFlagOffset < regTabPtr->tupNullWords) &&
-             (nullWordOffset < tCheckOffset));
-  Uint32 nullBits = tTupleHeader[nullWordOffset];
-  Uint32 bitCount = AttributeDescriptor::getArraySize(attrDescriptor);  
-  Uint32 pos = (nullFlagOffset << 5) + nullFlagBitOffset;
-
+  Uint32 pos = AttributeOffset::getNullFlagPos(attrDes2);
+  Uint32 bitCount = AttributeDescriptor::getArraySize(attrDescriptor);
+  
   if (!nullIndicator) {
     BitmaskImpl::clear(regTabPtr->tupNullWords,
 		       tTupleHeader+regTabPtr->tupNullIndex,
@@ -1174,9 +1146,9 @@ Dbtup::updateBitsNULLable(Uint32* inBuffer,
 			  pos+1,
 			  bitCount,
 			  inBuffer+indexBuf+1);
-
+    
     Uint32 newIndex = indexBuf + 1 + ((bitCount + 31) >> 5);
-    tInBufLen = newIndex;
+    tInBufIndex = newIndex;
     return true;
   } else {
     Uint32 newIndex = tInBufIndex + 1;
diff --git a/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp b/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp
index aac5c326cad..476a4b5724b 100644
--- a/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp
+++ b/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp
@@ -753,7 +753,7 @@ bool Dbtup::readTriggerInfo(TupTriggerData* const trigPtr,
 			  regTabPtr->noOfKeyAttr,
 			  keyBuffer,
 			  ZATTR_BUFFER_SIZE,
-			  true);
+			  false);
   ndbrequire(ret != -1);
   noPrimKey= ret;
 
@@ -796,7 +796,7 @@ bool Dbtup::readTriggerInfo(TupTriggerData* const trigPtr,
 			    numAttrsToRead,
 			    mainBuffer,
 			    ZATTR_BUFFER_SIZE,
-			    true);
+			    false);
     ndbrequire(ret != -1);
     noMainWords= ret;
   } else {
@@ -822,7 +822,7 @@ bool Dbtup::readTriggerInfo(TupTriggerData* const trigPtr,
 			    numAttrsToRead,
 			    copyBuffer,
 			    ZATTR_BUFFER_SIZE,
-			    true);
+			    false);
 
     ndbrequire(ret != -1);
     noCopyWords = ret;