diff options
| author | unknown <joreland@mysql.com> | 2004-11-19 15:06:03 +0100 |
|---|---|---|
| committer | unknown <joreland@mysql.com> | 2004-11-19 15:06:03 +0100 |
| commit | c5d03d61139d0824eafc26a2734a564c2e25f144 (patch) | |
| tree | e69ea51be36b86556ed0b8a9556dd1360ddcb46d | |
| parent | fe62e5ae3160e58d059847ae4405b083f891231e (diff) | |
| download | mariadb-git-c5d03d61139d0824eafc26a2734a564c2e25f144.tar.gz | |
ndb: fix merge bug in testBlobs
ndb/src/common/debugger/signaldata/SignalDataPrint.cpp:
Print TCINDXREQ as TCKEYREQ
ndb/src/ndbapi/NdbOperationSearch.cpp:
Fix correct attrinfo when using writeTuple
| -rw-r--r-- | ndb/src/common/debugger/signaldata/SignalDataPrint.cpp | 1 | ||||
| -rw-r--r-- | ndb/src/ndbapi/NdbOperationSearch.cpp | 15 |
2 files changed, 15 insertions, 1 deletions
diff --git a/ndb/src/common/debugger/signaldata/SignalDataPrint.cpp b/ndb/src/common/debugger/signaldata/SignalDataPrint.cpp index a2356e4974e..e879b7b9206 100644 --- a/ndb/src/common/debugger/signaldata/SignalDataPrint.cpp +++ b/ndb/src/common/debugger/signaldata/SignalDataPrint.cpp @@ -27,6 +27,7 @@ const NameFunctionPair SignalDataPrintFunctions[] = { { GSN_TCKEYREQ, printTCKEYREQ }, + { GSN_TCINDXREQ, printTCKEYREQ }, { GSN_TCKEYCONF, printTCKEYCONF }, { GSN_TCKEYREF, printTCKEYREF }, { GSN_LQHKEYREQ, printLQHKEYREQ }, diff --git a/ndb/src/ndbapi/NdbOperationSearch.cpp b/ndb/src/ndbapi/NdbOperationSearch.cpp index e9a57375566..1c8f3d53a19 100644 --- a/ndb/src/ndbapi/NdbOperationSearch.cpp +++ b/ndb/src/ndbapi/NdbOperationSearch.cpp @@ -209,7 +209,20 @@ NdbOperation::equal_impl(const NdbColumnImpl* tAttrInfo, goto equal_error4; Uint32 ahValue; const Uint32 sz = totalSizeInWords; - AttributeHeader::init(&ahValue, tAttrId, sz); + + // XXX + if(m_accessTable == m_currentTable) + { + AttributeHeader::init(&ahValue, tAttrId, sz); + } + else + { + assert(m_accessTable->m_index); + int attr_id_current_table = + m_accessTable->m_index->m_columns[tAttrId]->m_keyInfoPos; + AttributeHeader::init(&ahValue, attr_id_current_table, sz); + } + insertATTRINFO( ahValue ); insertATTRINFOloop((Uint32*)aValueToWrite, sz); }//if |