← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/pbxt/src/xactlog_xt.cc

Merge Paul

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/pbxt/src/xactlog_xt.cc
118
118
        cont_(a);
119
119
}
120
120
 
121
 
xtPublic void xt_xlog_exit(XTThreadPtr)
 
121
xtPublic void xt_xlog_exit(XTThreadPtr XT_UNUSED(self))
122
122
{
123
123
        for (u_int i=0; i<XLC_SEGMENT_COUNT; i++) {
124
124
                if (xt_xlog_cache.xlc_segment[i].lcs_hash_table) {
2185
2185
        record = (XTXactLogBufferDPtr) (seq->xseq_buffer + rec_offset);
2186
2186
        switch (record->xh.xh_status_1) {
2187
2187
                case XT_LOG_ENT_HEADER:
2188
 
                        len = sizeof(XTXactLogHeaderDRec);
 
2188
                        len = offsetof(XTXactLogHeaderDRec, xh_version_2) + 2;
 
2189
                        if (len > max_rec_len)
 
2190
                                /* The size is not in the buffer: */
 
2191
                                goto read_more;
 
2192
                        len = (size_t) XT_GET_DISK_4(record->xh.xh_size_4);
2189
2193
                        break;
2190
2194
                case XT_LOG_ENT_NEW_LOG:
2191
2195
                case XT_LOG_ENT_DEL_LOG: