diff options
| author | unknown <knielsen@knielsen-hq.org> | 2010-01-15 16:58:25 +0100 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2010-01-15 16:58:25 +0100 |
| commit | 13029651b5535d637aa6f652f17c8c4417a803bc (patch) | |
| tree | b65c4d4bf3227b2e2b86c13f4d098b57e9a60410 /storage/xtradb/mtr | |
| parent | d121e6630519a66eec7c953ee0eae623f592ce87 (diff) | |
| parent | 5b0ab60a4bfb4d5b603cd929b7ceb0d9fd1bac22 (diff) | |
| download | mariadb-git-13029651b5535d637aa6f652f17c8c4417a803bc.tar.gz | |
Merge XtraDB 9 into MariaDB.
Diffstat (limited to 'storage/xtradb/mtr')
| -rw-r--r-- | storage/xtradb/mtr/mtr0mtr.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/storage/xtradb/mtr/mtr0mtr.c b/storage/xtradb/mtr/mtr0mtr.c index 183e575fadd..34e6d3ffc92 100644 --- a/storage/xtradb/mtr/mtr0mtr.c +++ b/storage/xtradb/mtr/mtr0mtr.c @@ -36,6 +36,7 @@ Created 11/26/1995 Heikki Tuuri #include "buf0flu.h" #ifndef UNIV_HOTBACKUP +# include "log0recv.h" /*****************************************************************//** Releases the item in the slot given. */ UNIV_INLINE @@ -148,7 +149,6 @@ mtr_log_reserve_and_write( dyn_array_t* mlog; dyn_block_t* block; ulint data_size; - ibool success; byte* first_data; ut_ad(mtr); @@ -167,8 +167,8 @@ mtr_log_reserve_and_write( if (mlog->heap == NULL) { mtr->end_lsn = log_reserve_and_write_fast( first_data, dyn_block_get_used(mlog), - &(mtr->start_lsn), &success); - if (success) { + &mtr->start_lsn); + if (mtr->end_lsn) { return; } @@ -215,6 +215,8 @@ mtr_commit( ut_d(mtr->state = MTR_COMMITTING); #ifndef UNIV_HOTBACKUP + /* This is a dirty read, for debugging. */ + ut_ad(!recv_no_log_write); write_log = mtr->modifications && mtr->n_log_recs; if (write_log) { |