summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
Diffstat (limited to 'extra')
-rw-r--r--extra/innochecksum.cc3
-rw-r--r--extra/mariabackup/xtrabackup.cc2
2 files changed, 3 insertions, 2 deletions
diff --git a/extra/innochecksum.cc b/extra/innochecksum.cc
index b6f478b943b..40aefa24428 100644
--- a/extra/innochecksum.cc
+++ b/extra/innochecksum.cc
@@ -568,7 +568,8 @@ is_page_corrupted(
page_size);
if (is_corrupted && log_file) {
fprintf(log_file,
- "Page " ULINTPF ":%llu may be corrupted;"
+ "[page id: space=" ULINTPF
+ ", page_number=%llu] may be corrupted;"
" key_version=%u\n",
space_id, cur_page_num,
mach_read_from_4(
diff --git a/extra/mariabackup/xtrabackup.cc b/extra/mariabackup/xtrabackup.cc
index 8775584bff0..a3bcff03e51 100644
--- a/extra/mariabackup/xtrabackup.cc
+++ b/extra/mariabackup/xtrabackup.cc
@@ -1295,7 +1295,7 @@ struct my_option xb_server_options[] =
{"innodb_log_file_size", OPT_INNODB_LOG_FILE_SIZE,
"Ignored for mysqld option compatibility",
(G_PTR*) &srv_log_file_size, (G_PTR*) &srv_log_file_size, 0,
- GET_ULL, REQUIRED_ARG, 48 << 20, 1 << 20, 512ULL << 30, 0,
+ GET_ULL, REQUIRED_ARG, 48 << 20, 1 << 20, log_group_max_size, 0,
UNIV_PAGE_SIZE_MAX, 0},
{"innodb_log_files_in_group", OPT_INNODB_LOG_FILES_IN_GROUP,
"Ignored for mysqld option compatibility",