summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <tomas@whalegate.ndb.mysql.com>2007-12-13 12:04:00 +0100
committerunknown <tomas@whalegate.ndb.mysql.com>2007-12-13 12:04:00 +0100
commit7870d0a7da437315764cb3d494f62e9a9adb24de (patch)
tree8b15f6e5f0132967f755665522b0ca94a3a89fa2
parent127157370a4eea4b66bdb0a88f494bdb86aefa63 (diff)
parentcdca0af70d8da157ba86773aa03bb335fab1d43f (diff)
downloadmariadb-git-7870d0a7da437315764cb3d494f62e9a9adb24de.tar.gz
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
into whalegate.ndb.mysql.com:/home/tomas/cge-5.1 storage/ndb/src/kernel/vm/SimulatedBlock.cpp: Auto merged
-rw-r--r--storage/ndb/src/kernel/vm/SimulatedBlock.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/storage/ndb/src/kernel/vm/SimulatedBlock.cpp b/storage/ndb/src/kernel/vm/SimulatedBlock.cpp
index bc16b9f364e..2963b8a02ad 100644
--- a/storage/ndb/src/kernel/vm/SimulatedBlock.cpp
+++ b/storage/ndb/src/kernel/vm/SimulatedBlock.cpp
@@ -1056,6 +1056,7 @@ SimulatedBlock::assembleFragments(Signal * signal){
/**
* Don't release allocated segments
*/
+ signal->header.m_fragmentInfo = 0;
signal->header.m_noOfSections = 0;
return false;
}
@@ -1083,6 +1084,7 @@ SimulatedBlock::assembleFragments(Signal * signal){
* fragInfo = 2
*/
if(fragInfo == 2){
+ signal->header.m_fragmentInfo = 0;
signal->header.m_noOfSections = 0;
return false;
}