mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 20:42:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
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
This commit is contained in:
unknown 2006-02-20 08:40:24 +01:00
commit 2a4ca93d8e
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
storage/ndb/tools/restore/Restore.cpp
View file

@ -515,7 +515,8 @@ RestoreDataIterator::getNextTuple(int & res)
const AttributeDesc * attr_desc = m_tuple.getDesc(attrId);
// 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;
if(BitmaskImpl::get(m_currentTable->m_nullBitmaskSize,
buf_ptr,ind)){
@ -524,6 +525,11 @@ RestoreDataIterator::getNextTuple(int & res)
continue;
}
}
if (m_currentTable->backupVersion < MAKE_VERSION(5,1,3))
{
sz *= 4;
}
attr_data->null = false;
attr_data->void_value = &data->Data[0];
@ -842,7 +848,7 @@ void TableS::createAttr(NdbDictionary::Column *column)
}
// 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;
m_noOfNullable++;