Commit 7870d0a7 authored by unknown's avatar unknown

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
parents 12715737 cdca0af7
...@@ -1056,6 +1056,7 @@ SimulatedBlock::assembleFragments(Signal * signal){ ...@@ -1056,6 +1056,7 @@ SimulatedBlock::assembleFragments(Signal * signal){
/** /**
* Don't release allocated segments * Don't release allocated segments
*/ */
signal->header.m_fragmentInfo = 0;
signal->header.m_noOfSections = 0; signal->header.m_noOfSections = 0;
return false; return false;
} }
...@@ -1083,6 +1084,7 @@ SimulatedBlock::assembleFragments(Signal * signal){ ...@@ -1083,6 +1084,7 @@ SimulatedBlock::assembleFragments(Signal * signal){
* fragInfo = 2 * fragInfo = 2
*/ */
if(fragInfo == 2){ if(fragInfo == 2){
signal->header.m_fragmentInfo = 0;
signal->header.m_noOfSections = 0; signal->header.m_noOfSections = 0;
return false; return false;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment