← Back to branch summary

~mysql/mysql-server/mysql-6.0

« back to all changes in this revision

Viewing changes to storage/falcon/Dbb.cpp

auto-merge

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/falcon/Dbb.cpp
288
288
        Section::createSection(this, sectionId, transId);
289
289
}
290
290
 
291
 
int32 Dbb::insertStub(int32 sectionId, Transaction *transaction)
 
291
int32 Dbb::insertStub(int32 sectionId, TransactionState *transaction)
292
292
{
293
293
        TransId transId = (transaction) ? transaction->transactionId : 0;
294
294
        Section *section = findSection (sectionId);
297
297
}
298
298
 
299
299
 
300
 
int32 Dbb::insertStub(Section* section, Transaction* transaction)
 
300
int32 Dbb::insertStub(Section* section, TransactionState* transaction)
301
301
{
302
302
        TransId transId = (transaction) ? transaction->transactionId : 0;
303
303
        
328
328
                updateRecord(sectionId, recordId, stream, transaction->transactionId, false);
329
329
}
330
330
 
331
 
void Dbb::updateBlob(Section *blobSection, int recordNumber, Stream* stream, Transaction* transaction)
 
331
void Dbb::updateBlob(Section *blobSection, int recordNumber, Stream* stream, TransactionState* transState)
332
332
{
333
333
        if (!serialLog->recovering && stream && stream->totalLength < (int) falcon_large_blob_threshold)
334
334
                {
335
 
                serialLog->logControl->smallBlob.append(this, blobSection->sectionId, transaction->transactionId, recordNumber, stream);
336
 
                updateRecord(blobSection, recordNumber, stream, transaction, false);
 
335
                serialLog->logControl->smallBlob.append(this, blobSection->sectionId, transState->transactionId, recordNumber, stream);
 
336
                updateRecord(blobSection, recordNumber, stream, transState, false);
337
337
                }
338
338
        else
339
339
                {
340
 
                updateRecord(blobSection, recordNumber, stream, transaction, true);
341
 
                transaction->pendingPageWrites = true;
 
340
                updateRecord(blobSection, recordNumber, stream, transState, true);
 
341
                transState->pendingPageWrites = true;
342
342
                }
343
343
}
344
344
 
351
351
                serialLog->setPhysicalBlock(transId);
352
352
}
353
353
 
354
 
void Dbb::updateRecord(Section* section, int32 recordId, Stream* stream, Transaction* transaction, bool earlyWrite)
 
354
void Dbb::updateRecord(Section* section, int32 recordId, Stream* stream, TransactionState* transaction, bool earlyWrite)
355
355
{
356
356
        TransId transId = (transaction) ? transaction->transactionId : 0;
357
357
        section->updateRecord (recordId, stream, transId, earlyWrite);
1091
1091
                        //IndexPage::printPage (bdb, false);
1092
1092
                        {
1093
1093
                        IndexPage *indexPage = (IndexPage*) page;
1094
 
                        Log::debug ("Page %d is index page, parent %d, prior %d, next %d, lvl %d\n", 
1095
 
                                                 pageNumber, indexPage->parentPage, indexPage->priorPage, indexPage->nextPage, indexPage->level);
 
1094
                        Log::debug ("Page %d is index page, next %d, lvl %d\n", 
 
1095
                                                 pageNumber, indexPage->nextPage, indexPage->level);
1096
1096
                        }
1097
1097
                        break;
1098
1098