Commit 2a4ca93d authored by unknown's avatar unknown

Merge perch.ndb.mysql.com:/home/jonas/src/51-new

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new


storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
parents 55815835 9b55f51a
...@@ -515,7 +515,8 @@ RestoreDataIterator::getNextTuple(int & res) ...@@ -515,7 +515,8 @@ RestoreDataIterator::getNextTuple(int & res)
const AttributeDesc * attr_desc = m_tuple.getDesc(attrId); const AttributeDesc * attr_desc = m_tuple.getDesc(attrId);
// just a reminder - remove when backwards compat implemented // just a reminder - remove when backwards compat implemented
if(false && attr_desc->m_column->getNullable()){ if(m_currentTable->backupVersion < MAKE_VERSION(5,1,3) &&
attr_desc->m_column->getNullable()){
const Uint32 ind = attr_desc->m_nullBitIndex; const Uint32 ind = attr_desc->m_nullBitIndex;
if(BitmaskImpl::get(m_currentTable->m_nullBitmaskSize, if(BitmaskImpl::get(m_currentTable->m_nullBitmaskSize,
buf_ptr,ind)){ buf_ptr,ind)){
...@@ -525,6 +526,11 @@ RestoreDataIterator::getNextTuple(int & res) ...@@ -525,6 +526,11 @@ RestoreDataIterator::getNextTuple(int & res)
} }
} }
if (m_currentTable->backupVersion < MAKE_VERSION(5,1,3))
{
sz *= 4;
}
attr_data->null = false; attr_data->null = false;
attr_data->void_value = &data->Data[0]; attr_data->void_value = &data->Data[0];
attr_data->size = sz; attr_data->size = sz;
...@@ -842,7 +848,7 @@ void TableS::createAttr(NdbDictionary::Column *column) ...@@ -842,7 +848,7 @@ void TableS::createAttr(NdbDictionary::Column *column)
} }
// just a reminder - does not solve backwards compat // just a reminder - does not solve backwards compat
if (backupVersion < MAKE_VERSION(5,1,0)) if (backupVersion < MAKE_VERSION(5,1,3))
{ {
d->m_nullBitIndex = m_noOfNullable; d->m_nullBitIndex = m_noOfNullable;
m_noOfNullable++; m_noOfNullable++;
......
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