← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/mtr/mtr0mtr.c

Merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/mtr/mtr0mtr.c
35
35
#include "log0log.h"
36
36
 
37
37
#ifndef UNIV_HOTBACKUP
 
38
# include "log0recv.h"
38
39
/*****************************************************************//**
39
40
Releases the item in the slot given. */
40
41
UNIV_INLINE
115
116
        dyn_array_t*    mlog;
116
117
        dyn_block_t*    block;
117
118
        ulint           data_size;
118
 
        ibool           success;
119
119
        byte*           first_data;
120
120
 
121
121
        ut_ad(mtr);
134
134
        if (mlog->heap == NULL) {
135
135
                mtr->end_lsn = log_reserve_and_write_fast(
136
136
                        first_data, dyn_block_get_used(mlog),
137
 
                        &(mtr->start_lsn), &success);
138
 
                if (success) {
 
137
                        &mtr->start_lsn);
 
138
                if (mtr->end_lsn) {
139
139
 
140
140
                        return;
141
141
                }
182
182
        ut_d(mtr->state = MTR_COMMITTING);
183
183
 
184
184
#ifndef UNIV_HOTBACKUP
 
185
        /* This is a dirty read, for debugging. */
 
186
        ut_ad(!recv_no_log_write);
185
187
        write_log = mtr->modifications && mtr->n_log_recs;
186
188
 
187
189
        if (write_log) {