← Back to branch summary

~thomir-deactivatedaccount/drizzle/drizzle-fix-bug653747

« back to all changes in this revision

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

  • Committer: Brian Aker
  • Date: 2010-10-10 02:07:52 UTC
  • mfrom: (1827.2.3 staging)
  • Revision ID: brian@tangent.org-20101010020752-ktv73isay5dxtvp3
Merge in switch on table_share_instance inheritance.

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"
39
38
/*****************************************************************//**
40
39
Releases the item in the slot given. */
41
40
UNIV_INLINE
116
115
        dyn_array_t*    mlog;
117
116
        dyn_block_t*    block;
118
117
        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);
138
 
                if (mtr->end_lsn) {
 
137
                        &(mtr->start_lsn), &success);
 
138
                if (success) {
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);
187
185
        write_log = mtr->modifications && mtr->n_log_recs;
188
186
 
189
187
        if (write_log) {