diff options
| author | unknown <knielsen@loke.(none)> | 2007-10-25 10:48:42 +0200 |
|---|---|---|
| committer | unknown <knielsen@loke.(none)> | 2007-10-25 10:48:42 +0200 |
| commit | 6825b79b41f47e862a17c22d4450b3ce4cdde2af (patch) | |
| tree | 191b2cfabf66c1d2a7c0462b471e2cd3bd0e9f74 /storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp | |
| parent | 9cae2b798440a6c3c42fb6f6c1bbfd3b565bd33c (diff) | |
| parent | 29186ecd8d8d1fc9f212b8a127cee6c9656e1dff (diff) | |
| download | mariadb-git-6825b79b41f47e862a17c22d4450b3ce4cdde2af.tar.gz | |
Merge loke.(none):/home/knielsen/devel/mysql-5.1-telco-gca
into loke.(none):/home/knielsen/devel/mysql-5.1-new-ndb
storage/ndb/include/kernel/AttributeHeader.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbOperationDefine.cpp:
SCCS merged
Diffstat (limited to 'storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp')
| -rw-r--r-- | storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp b/storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp index 45766e5e9c4..a642d704eb9 100644 --- a/storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp +++ b/storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp @@ -1957,9 +1957,8 @@ int Dbtup::interpreterNextLab(Signal* signal, Uint32 TdataForUpdate[3]; Uint32 Tlen; - AttributeHeader& ah= AttributeHeader::init(&TdataForUpdate[0], - TattrId, - TattrNoOfWords << 2); + AttributeHeader ah(TattrId, TattrNoOfWords << 2); + TdataForUpdate[0]= ah.m_value; TdataForUpdate[1]= TregMemBuffer[theRegister + 2]; TdataForUpdate[2]= TregMemBuffer[theRegister + 3]; Tlen= TattrNoOfWords + 1; @@ -1975,6 +1974,7 @@ int Dbtup::interpreterNextLab(Signal* signal, // Write a NULL value into the attribute /* --------------------------------------------------------- */ ah.setNULL(); + TdataForUpdate[0]= ah.m_value; Tlen= 1; } int TnoDataRW= updateAttributes(req_struct, |