← Back to branch summary

~mysql/mysql-server/mysql-6.0

« back to all changes in this revision

Viewing changes to storage/falcon/EncodedRecord.cpp

auto-merge

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/falcon/EncodedRecord.cpp
22
22
#include "Stream.h"
23
23
#include "Table.h"
24
24
#include "Value.h"
 
25
#include "Transaction.h"
25
26
 
26
27
static const UCHAR lengthShifts[] = { 0, 8, 16, 24, 32, 40, 48, 56 };
27
28
 
42
43
 
43
44
void EncodedRecord::encodeAsciiBlob(Value *value)
44
45
{
45
 
        int32 val = table->getBlobId (value, 0, false, transaction);
 
46
        int32 val = table->getBlobId (value, 0, false, transaction->transactionState);
46
47
        EncodedDataStream::encodeAsciiBlob(val);
47
48
 
48
49
        /***
56
57
 
57
58
void EncodedRecord::encodeBinaryBlob(Value *value)
58
59
{
59
 
        int32 val = table->getBlobId (value, 0, false, transaction);
60
 
                EncodedDataStream::encodeBinaryBlob(val);
 
60
        int32 val = table->getBlobId (value, 0, false, transaction->transactionState);
 
61
        EncodedDataStream::encodeBinaryBlob(val);
61
62
 
62
63
        /***
63
64
        int count = BYTE_COUNT(val);