database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-18 07:48:43 +03:00
Code Activity

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new

Browse Source 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
This commit is contained in:
tomas@poseidon.ndb.mysql.com
2006-02-20 18:23:30 +01:00
parent 93db514db6 529be8eb98
commit 995d7ed1f9
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
storage/ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp
View File

@@ -452,7 +452,7 @@ Dbtup::execBUILDINDXREQ(Signal* signal)
} }
// set to first tuple position // set to first tuple position
const Uint32 firstTupleNo = ! buildPtr.p->m_build_vs ? 0 : 1; const Uint32 firstTupleNo = 0;
buildPtr.p->m_fragNo= 0; buildPtr.p->m_fragNo= 0;
buildPtr.p->m_pageId= 0; buildPtr.p->m_pageId= 0;
buildPtr.p->m_tupleNo= firstTupleNo; buildPtr.p->m_tupleNo= firstTupleNo;

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); 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)){
@@ -524,6 +525,11 @@ RestoreDataIterator::getNextTuple(int & res)
continue; continue;
} }
} }
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];
@@ -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++;