diff options
Diffstat (limited to 'extra/mariabackup/backup_mysql.cc')
| -rw-r--r-- | extra/mariabackup/backup_mysql.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/extra/mariabackup/backup_mysql.cc b/extra/mariabackup/backup_mysql.cc index 3c16bdf7753..ba6e9e4818a 100644 --- a/extra/mariabackup/backup_mysql.cc +++ b/extra/mariabackup/backup_mysql.cc @@ -54,7 +54,7 @@ Street, Fifth Floor, Boston, MA 02110-1335 USA #include "backup_copy.h" #include "backup_mysql.h" #include "mysqld.h" -#include "encryption_plugin.h" +#include "xb_plugin.h" #include <sstream> #include <sql_error.h> #include "page0zip.h" @@ -514,7 +514,8 @@ bool get_mysql_vars(MYSQL *connection) if (innodb_undo_tablespaces_var) { - srv_undo_tablespaces= strtoul(innodb_undo_tablespaces_var, &endptr, 10); + srv_undo_tablespaces= static_cast<uint32_t> + (strtoul(innodb_undo_tablespaces_var, &endptr, 10)); ut_ad(*endptr == 0); } @@ -1605,7 +1606,7 @@ bool write_backup_config_file() "innodb_log_file_size=%llu\n" "innodb_page_size=%lu\n" "innodb_undo_directory=%s\n" - "innodb_undo_tablespaces=%lu\n" + "innodb_undo_tablespaces=%u\n" "innodb_compression_level=%u\n" "%s%s\n" "%s\n", @@ -1620,7 +1621,7 @@ bool write_backup_config_file() "innodb_buffer_pool_filename=" : "", innobase_buffer_pool_filename ? innobase_buffer_pool_filename : "", - encryption_plugin_get_config()); + xb_plugin_get_config()); return rc; } |