summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <joreland@mysql.com>2004-12-01 10:04:49 +0100
committerunknown <joreland@mysql.com>2004-12-01 10:04:49 +0100
commit1c5a01e17c07e78e88b74a4da0ff3917390e4143 (patch)
tree76f7cb8c870d2fac55ac0602a3f762f9d04b6e5e
parentaa1fb2c4d3ea29d9496f6613c6a19821471c4ac4 (diff)
downloadmariadb-git-1c5a01e17c07e78e88b74a4da0ff3917390e4143.tar.gz
bug#6871 - ndb
replace with charsets check update of primary key wo/ normalizing ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp: Make sure tXfrmFlag is false when checking for update of primary key
-rw-r--r--ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp b/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp
index e6cc6f68842..cbb165c3eb1 100644
--- a/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp
+++ b/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp
@@ -706,7 +706,10 @@ Dbtup::checkUpdateOfPrimaryKey(Uint32* updateBuffer, Tablerec* const regTabPtr)
tOutBufIndex = 0;
tMaxRead = MAX_KEY_SIZE_IN_WORDS;
+ bool tmp = tXfrmFlag;
+ tXfrmFlag = false;
ndbrequire((this->*f)(&keyReadBuffer[0], ahOut, attrDescriptor, attributeOffset));
+ tXfrmFlag = tmp;
ndbrequire(tOutBufIndex == ahOut->getDataSize());
if (ahIn.getDataSize() != ahOut->getDataSize()) {
ljam();