diff options
| author | monty@mysql.com <> | 2004-03-16 22:41:30 +0200 |
|---|---|---|
| committer | monty@mysql.com <> | 2004-03-16 22:41:30 +0200 |
| commit | 350b4335696fc88efa2bbf2139d2f8bf9aa5701c (patch) | |
| tree | af285d8080c003d1ecb1479ec43c9b6996fd567f /innobase/mtr | |
| parent | 861bf3c8c031ea80076acb7f7466bda73b23213c (diff) | |
| parent | 325f6615254c871d71d9d71bb5910a61d9a61ea2 (diff) | |
| download | mariadb-git-350b4335696fc88efa2bbf2139d2f8bf9aa5701c.tar.gz | |
merge with 4.0
Diffstat (limited to 'innobase/mtr')
| -rw-r--r-- | innobase/mtr/mtr0log.c | 13 | ||||
| -rw-r--r-- | innobase/mtr/mtr0mtr.c | 2 |
2 files changed, 6 insertions, 9 deletions
diff --git a/innobase/mtr/mtr0log.c b/innobase/mtr/mtr0log.c index 4b5d7e61de6..5a4aaa2377d 100644 --- a/innobase/mtr/mtr0log.c +++ b/innobase/mtr/mtr0log.c @@ -59,7 +59,7 @@ mlog_write_initial_log_record( fprintf(stderr, "InnoDB: Error: trying to write to a stray memory location %lx\n", (ulong) ptr); - ut_a(0); + ut_error; } log_ptr = mlog_open(mtr, 20); @@ -222,7 +222,7 @@ mlog_write_ulint( fprintf(stderr, "InnoDB: Error: trying to write to a stray memory location %lx\n", (ulong) ptr); - ut_a(0); + ut_error; } if (type == MLOG_1BYTE) { @@ -261,7 +261,6 @@ mlog_write_dulint( /*==============*/ byte* ptr, /* in: pointer where to write */ dulint val, /* in: value to write */ - byte type, /* in: MLOG_8BYTES */ mtr_t* mtr) /* in: mini-transaction handle */ { byte* log_ptr; @@ -270,11 +269,10 @@ mlog_write_dulint( fprintf(stderr, "InnoDB: Error: trying to write to a stray memory location %lx\n", (ulong) ptr); - ut_a(0); + ut_error; } ut_ad(ptr && mtr); - ut_ad(type == MLOG_8BYTES); mach_write_to_8(ptr, val); @@ -286,7 +284,8 @@ mlog_write_dulint( return; } - log_ptr = mlog_write_initial_log_record_fast(ptr, type, log_ptr, mtr); + log_ptr = mlog_write_initial_log_record_fast(ptr, MLOG_8BYTES, + log_ptr, mtr); mach_write_to_2(log_ptr, ptr - buf_frame_align(ptr)); log_ptr += 2; @@ -314,7 +313,7 @@ mlog_write_string( fprintf(stderr, "InnoDB: Error: trying to write to a stray memory location %lx\n", (ulong) ptr); - ut_a(0); + ut_error; } ut_ad(ptr && mtr); ut_a(len < UNIV_PAGE_SIZE); diff --git a/innobase/mtr/mtr0mtr.c b/innobase/mtr/mtr0mtr.c index 60e3ecfe150..ac1a638063d 100644 --- a/innobase/mtr/mtr0mtr.c +++ b/innobase/mtr/mtr0mtr.c @@ -495,13 +495,11 @@ mtr_read_dulint( /*===========*/ /* out: value read */ byte* ptr, /* in: pointer from where to read */ - ulint type __attribute__((unused)), /* in: MLOG_8BYTES */ mtr_t* mtr __attribute__((unused))) /* in: mini-transaction handle */ { ut_ad(mtr->state == MTR_ACTIVE); ut_ad(ptr && mtr); - ut_ad(type == MLOG_8BYTES); ut_ad(mtr_memo_contains(mtr, buf_block_align(ptr), MTR_MEMO_PAGE_S_FIX) || mtr_memo_contains(mtr, buf_block_align(ptr), |