summaryrefslogtreecommitdiff
path: root/extra/mariabackup
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2019-08-13 19:28:51 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2019-08-13 19:28:51 +0300
commit65d48b4a7bd7a57a27f2e9ca54473e1ae86223b5 (patch)
treef145a7a095011fbc4e6661e1675f72f6cdca38b6 /extra/mariabackup
parenteedd6179c1e5e8651270b353a693887179ad7bf3 (diff)
parented4ccf34a6603bd2374a721a7e1ad88472f335fc (diff)
downloadmariadb-git-65d48b4a7bd7a57a27f2e9ca54473e1ae86223b5.tar.gz
Merge 10.2 to 10.3
Diffstat (limited to 'extra/mariabackup')
-rw-r--r--extra/mariabackup/xtrabackup.cc2
1 files changed, 1 insertions, 1 deletions
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",