diff options
author | Oleksandr Byelkin <sanja@mariadb.com> | 2022-10-04 13:32:38 +0200 |
---|---|---|
committer | Oleksandr Byelkin <sanja@mariadb.com> | 2022-10-04 13:32:38 +0200 |
commit | bb76dcbec77d31818ec7dfc0d0dc1f4b49185bc5 (patch) | |
tree | 0c288f685ac6fbc8d4bd4cdbc60bcf9942f019f7 /storage/maria/ma_loghandler.c | |
parent | 1ac8149b83f002cd4754e1eca225560bc02b22e4 (diff) | |
parent | 55e07d9ade51e9e969f528d903509806142f4d1e (diff) | |
download | mariadb-git-bb76dcbec77d31818ec7dfc0d0dc1f4b49185bc5.tar.gz |
Merge branch '10.9' into 10.10
Diffstat (limited to 'storage/maria/ma_loghandler.c')
-rw-r--r-- | storage/maria/ma_loghandler.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/storage/maria/ma_loghandler.c b/storage/maria/ma_loghandler.c index fc46022f5b1..6572ff8e140 100644 --- a/storage/maria/ma_loghandler.c +++ b/storage/maria/ma_loghandler.c @@ -2661,7 +2661,7 @@ static my_bool translog_buffer_flush(struct st_translog_buffer *buffer) i < buffer->size; i+= TRANSLOG_PAGE_SIZE, pg++) { -#ifndef DBUG_OFF +#ifdef DBUG_TRACE TRANSLOG_ADDRESS addr= (buffer->offset + i); #endif DBUG_PRINT("info", ("send log form %lu till %lu address: " LSN_FMT " " @@ -2908,7 +2908,7 @@ static my_bool translog_page_validator(int res, PAGECACHE_IO_HOOK_ARGS *args) uint flags; uchar *page_pos; TRANSLOG_FILE *data= (TRANSLOG_FILE *) args->data; -#ifndef DBUG_OFF +#ifdef DBUG_TRACE pgcache_page_no_t offset= page_no * TRANSLOG_PAGE_SIZE; #endif DBUG_ENTER("translog_page_validator"); @@ -3268,7 +3268,7 @@ static my_bool translog_get_last_page_addr(TRANSLOG_ADDRESS *addr, my_off_t file_size; uint32 file_no= LSN_FILE_NO(*addr); TRANSLOG_FILE *file; -#ifndef DBUG_OFF +#ifdef DBUG_TRACE char buff[21]; #endif DBUG_ENTER("translog_get_last_page_addr"); |