Commit ea595ff5 authored by pekka@mysql.com's avatar pekka@mysql.com

bug-5252 fix (tinyblob)

parent e85ce089
...@@ -145,6 +145,7 @@ NdbBlob::init() ...@@ -145,6 +145,7 @@ NdbBlob::init()
theNdbOp = NULL; theNdbOp = NULL;
theTable = NULL; theTable = NULL;
theAccessTable = NULL; theAccessTable = NULL;
theBlobTable = NULL;
theColumn = NULL; theColumn = NULL;
theFillChar = 0; theFillChar = 0;
theInlineSize = 0; theInlineSize = 0;
...@@ -1028,9 +1029,9 @@ NdbBlob::atPrepare(NdbConnection* aCon, NdbOperation* anOp, const NdbColumnImpl* ...@@ -1028,9 +1029,9 @@ NdbBlob::atPrepare(NdbConnection* aCon, NdbOperation* anOp, const NdbColumnImpl*
// sanity check // sanity check
assert((NDB_BLOB_HEAD_SIZE << 2) == sizeof(Head)); assert((NDB_BLOB_HEAD_SIZE << 2) == sizeof(Head));
assert(theColumn->m_attrSize * theColumn->m_arraySize == sizeof(Head) + theInlineSize); assert(theColumn->m_attrSize * theColumn->m_arraySize == sizeof(Head) + theInlineSize);
const NdbDictionary::Table* bt;
const NdbDictionary::Column* bc;
if (thePartSize > 0) { if (thePartSize > 0) {
const NdbDictionary::Table* bt = NULL;
const NdbDictionary::Column* bc = NULL;
if (theStripeSize == 0 || if (theStripeSize == 0 ||
(bt = theColumn->getBlobTable()) == NULL || (bt = theColumn->getBlobTable()) == NULL ||
(bc = bt->getColumn("DATA")) == NULL || (bc = bt->getColumn("DATA")) == NULL ||
...@@ -1039,8 +1040,8 @@ NdbBlob::atPrepare(NdbConnection* aCon, NdbOperation* anOp, const NdbColumnImpl* ...@@ -1039,8 +1040,8 @@ NdbBlob::atPrepare(NdbConnection* aCon, NdbOperation* anOp, const NdbColumnImpl*
setErrorCode(ErrTable); setErrorCode(ErrTable);
return -1; return -1;
} }
theBlobTable = &NdbTableImpl::getImpl(*bt);
} }
theBlobTable = & NdbTableImpl::getImpl(*bt);
// buffers // buffers
theKeyBuf.alloc(theTable->m_sizeOfKeysInWords << 2); theKeyBuf.alloc(theTable->m_sizeOfKeysInWords << 2);
theAccessKeyBuf.alloc(theAccessTable->m_sizeOfKeysInWords << 2); theAccessKeyBuf.alloc(theAccessTable->m_sizeOfKeysInWords << 2);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment