diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-08 20:45:45 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-08 20:45:45 +0200 |
| commit | ab7e2b048d7d0835ae7473873169b7606114348e (patch) | |
| tree | 26660daf3f339f8bc54d2449985d951bc37b7921 /extra/mariabackup/backup_mysql.cc | |
| parent | bf71d263621c90cbddc7bde9bf071dae503f333f (diff) | |
| parent | 6567636b09ba410a330cd45285e489c628c4ff37 (diff) | |
| download | mariadb-git-ab7e2b048d7d0835ae7473873169b7606114348e.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'extra/mariabackup/backup_mysql.cc')
| -rw-r--r-- | extra/mariabackup/backup_mysql.cc | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/extra/mariabackup/backup_mysql.cc b/extra/mariabackup/backup_mysql.cc index a691cb664f1..184cd1b4504 100644 --- a/extra/mariabackup/backup_mysql.cc +++ b/extra/mariabackup/backup_mysql.cc @@ -55,8 +55,7 @@ this program; if not, write to the Free Software Foundation, Inc., #include "encryption_plugin.h" #include <sstream> #include <sql_error.h> -#include <ut0ut.h> - +#include "page0zip.h" char *tool_name; char tool_args[2048]; @@ -352,6 +351,7 @@ get_mysql_vars(MYSQL *connection) char *innodb_undo_directory_var = NULL; char *innodb_page_size_var = NULL; char *innodb_undo_tablespaces_var = NULL; + char *page_zip_level_var = NULL; char *endptr; unsigned long server_version = mysql_get_server_version(connection); @@ -381,6 +381,7 @@ get_mysql_vars(MYSQL *connection) {"innodb_undo_directory", &innodb_undo_directory_var}, {"innodb_page_size", &innodb_page_size_var}, {"innodb_undo_tablespaces", &innodb_undo_tablespaces_var}, + {"innodb_compression_level", &page_zip_level_var}, {NULL, NULL} }; @@ -514,7 +515,13 @@ get_mysql_vars(MYSQL *connection) } if (innodb_undo_tablespaces_var) { - srv_undo_tablespaces = strtoul(innodb_undo_tablespaces_var, &endptr, 10); + srv_undo_tablespaces = strtoul(innodb_undo_tablespaces_var, + &endptr, 10); + ut_ad(*endptr == 0); + } + + if (page_zip_level_var != NULL) { + page_zip_level = strtoul(page_zip_level_var, &endptr, 10); ut_ad(*endptr == 0); } @@ -1662,6 +1669,7 @@ bool write_backup_config_file() "innodb_page_size=%lu\n" "innodb_undo_directory=%s\n" "innodb_undo_tablespaces=%lu\n" + "innodb_compression_level=%u\n" "%s%s\n" "%s\n", innodb_checksum_algorithm_names[srv_checksum_algorithm], @@ -1671,6 +1679,7 @@ bool write_backup_config_file() srv_page_size, srv_undo_dir, srv_undo_tablespaces, + page_zip_level, innobase_buffer_pool_filename ? "innodb_buffer_pool_filename=" : "", innobase_buffer_pool_filename ? |