← Back to branch summary

~jlukas79/+junk/mysql-server

« back to all changes in this revision

Viewing changes to storage/falcon/EncodedDataStream.cpp

manual merge 6.0-main --> 6.0-bka-review

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/falcon/EncodedDataStream.cpp
89
89
        stream = strm;
90
90
}
91
91
 
92
 
EncodedDataStream::EncodedDataStream(const unsigned char *data)
 
92
EncodedDataStream::EncodedDataStream(const UCHAR *data, uint length)
93
93
{
94
94
        ptr = data;
 
95
        end = data + length;
95
96
}
96
97
 
97
98
EncodedDataStream::~EncodedDataStream()
738
739
 
739
740
DataStreamType EncodedDataStream::decode()
740
741
{
 
742
        if (ptr >= end)
 
743
                {
 
744
                type = edsTypeNull;
 
745
                
 
746
                return type;
 
747
                }
 
748
                
741
749
        UCHAR code = *ptr++;
742
750
        
743
751
        switch(code)
1165
1173
        ptr = skip(ptr);
1166
1174
}
1167
1175
 
1168
 
void EncodedDataStream::setData(const UCHAR *data)
 
1176
void EncodedDataStream::setData(const UCHAR *data, uint length)
1169
1177
{
1170
1178
        ptr = data;
 
1179
        end = data + length;
1171
1180
}
1172
1181
 
1173
1182
void EncodedDataStream::encodeNull()