diff options
| author | unknown <pekka@mysql.com> | 2006-03-23 04:59:14 +0100 |
|---|---|---|
| committer | unknown <pekka@mysql.com> | 2006-03-23 04:59:14 +0100 |
| commit | 8bc7214f2b26c503b1af74ecfb2a9f6e10dce950 (patch) | |
| tree | 954613b0582f6ba5f032476cf614b22c5b1a1e0e /storage/ndb/src/ndbapi/NdbBlob.cpp | |
| parent | 187ff695092a300880c33f7acc0f384208d5c6b0 (diff) | |
| download | mariadb-git-8bc7214f2b26c503b1af74ecfb2a9f6e10dce950.tar.gz | |
ndb - bug#17813 schema.query => blob
storage/ndb/include/ndbapi/NdbDictionary.hpp:
ER_ALL: omit unchanged blob inlines
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
ER_ALL: omit unchanged blob inlines
storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
ER_ALL: omit unchanged blob inlines
storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
ER_ALL: omit unchanged blob inlines
storage/ndb/src/ndbapi/NdbBlob.cpp:
atNextEvent: ignore non-data event
sql/ha_ndbcluster_binlog.cc:
schema.query => blob
storage/ndb/tools/restore/Restore.cpp:
allow 'system tables' to have blob attrs
storage/ndb/tools/restore/Restore.hpp:
allow 'system tables' to have blob attrs
storage/ndb/tools/restore/restore_main.cpp:
allow 'system tables' to have blob attrs
Diffstat (limited to 'storage/ndb/src/ndbapi/NdbBlob.cpp')
| -rw-r--r-- | storage/ndb/src/ndbapi/NdbBlob.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/storage/ndb/src/ndbapi/NdbBlob.cpp b/storage/ndb/src/ndbapi/NdbBlob.cpp index 5fbfd6f5111..2b655a3dc0e 100644 --- a/storage/ndb/src/ndbapi/NdbBlob.cpp +++ b/storage/ndb/src/ndbapi/NdbBlob.cpp @@ -598,6 +598,8 @@ NdbBlob::getHeadFromRecAttr() theNullFlag = theHeadInlineRecAttr->isNULL(); assert(theEventBlobVersion >= 0 || theNullFlag != -1); theLength = ! theNullFlag ? theHead->length : 0; + DBUG_PRINT("info", ("theNullFlag=%d theLength=%llu", + theNullFlag, theLength)); DBUG_VOID_RETURN; } @@ -1835,10 +1837,13 @@ int NdbBlob::atNextEvent() { DBUG_ENTER("NdbBlob::atNextEvent"); - DBUG_PRINT("info", ("this=%p op=%p blob op=%p version=%d", this, theEventOp, theBlobEventOp, theEventBlobVersion)); + Uint32 optype = theEventOp->m_data_item->sdata->operation; + DBUG_PRINT("info", ("this=%p op=%p blob op=%p version=%d optype=%u", this, theEventOp, theBlobEventOp, theEventBlobVersion, optype)); if (theState == Invalid) DBUG_RETURN(-1); assert(theEventBlobVersion >= 0); + if (optype >= NdbDictionary::Event::_TE_FIRST_NON_DATA_EVENT) + DBUG_RETURN(0); getHeadFromRecAttr(); if (theNullFlag == -1) // value not defined DBUG_RETURN(0); |