diff options
Diffstat (limited to 'innobase/mtr')
| -rw-r--r-- | innobase/mtr/mtr0log.c | 15 | ||||
| -rw-r--r-- | innobase/mtr/mtr0mtr.c | 5 |
2 files changed, 9 insertions, 11 deletions
diff --git a/innobase/mtr/mtr0log.c b/innobase/mtr/mtr0log.c index e3ba531bcb8..82baa8905ba 100644 --- a/innobase/mtr/mtr0log.c +++ b/innobase/mtr/mtr0log.c @@ -54,15 +54,15 @@ mlog_write_initial_log_record( byte* log_ptr; ut_ad(type <= MLOG_BIGGEST_TYPE); + ut_ad(type > MLOG_8BYTES); if (ptr < buf_pool->frame_zero || ptr >= buf_pool->high_end) { fprintf(stderr, - "InnoDB: Error: trying to write to a stray memory location %lx\n", - (ulint)ptr); + "InnoDB: Error: trying to write to a stray memory location %p\n", ptr); ut_error; } - log_ptr = mlog_open(mtr, 20); + log_ptr = mlog_open(mtr, 11); /* If no logging is requested, we may return now */ if (log_ptr == NULL) { @@ -221,8 +221,7 @@ mlog_write_ulint( if (ptr < buf_pool->frame_zero || ptr >= buf_pool->high_end) { fprintf(stderr, - "InnoDB: Error: trying to write to a stray memory location %lx\n", - (ulint)ptr); + "InnoDB: Error: trying to write to a stray memory location %p\n", ptr); ut_error; } @@ -268,8 +267,7 @@ mlog_write_dulint( if (ptr < buf_pool->frame_zero || ptr >= buf_pool->high_end) { fprintf(stderr, - "InnoDB: Error: trying to write to a stray memory location %lx\n", - (ulint)ptr); + "InnoDB: Error: trying to write to a stray memory location %p\n", ptr); ut_error; } @@ -312,8 +310,7 @@ mlog_write_string( if (ptr < buf_pool->frame_zero || ptr >= buf_pool->high_end) { fprintf(stderr, - "InnoDB: Error: trying to write to a stray memory location %lx\n", - (ulint)ptr); + "InnoDB: Error: trying to write to a stray memory location %p\n", ptr); ut_error; } ut_ad(ptr && mtr); diff --git a/innobase/mtr/mtr0mtr.c b/innobase/mtr/mtr0mtr.c index b2d8d022f8c..aaf2c9601f4 100644 --- a/innobase/mtr/mtr0mtr.c +++ b/innobase/mtr/mtr0mtr.c @@ -262,7 +262,8 @@ mtr_first_to_modify_page_after_backup( block->frame), backup_lsn) <= 0) { - printf("Page %lu newest %lu backup %lu\n", + fprintf(stderr, + "Page %lu newest %lu backup %lu\n", block->offset, ut_dulint_get_low( buf_frame_get_newest_modification( @@ -515,7 +516,7 @@ mtr_print( /*======*/ mtr_t* mtr) /* in: mtr */ { - printf( + fprintf(stderr, "Mini-transaction handle: memo size %lu bytes log size %lu bytes\n", dyn_array_get_data_size(&(mtr->memo)), dyn_array_get_data_size(&(mtr->log))); |