diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2020-03-25 15:09:14 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2020-03-25 15:53:38 +0100 |
| commit | 1b58ef7d3f9d9913437f7a53d11ba7b03ea91cf7 (patch) | |
| tree | cf5a5c4897ab6e3313f89fac5898b5d773742e6b /extra | |
| parent | bb8df68521964eb8dcb2e76624976e0ac181c08a (diff) | |
| download | mariadb-git-1b58ef7d3f9d9913437f7a53d11ba7b03ea91cf7.tar.gz | |
Build cleanups.
Fix clang-cl built
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/mariabackup/xtrabackup.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/extra/mariabackup/xtrabackup.cc b/extra/mariabackup/xtrabackup.cc index 6896205238b..3328e0a535e 100644 --- a/extra/mariabackup/xtrabackup.cc +++ b/extra/mariabackup/xtrabackup.cc @@ -229,8 +229,8 @@ parameters are declared in mysqld.cc: */ long innobase_buffer_pool_awe_mem_mb = 0; long innobase_file_io_threads = 4; -long innobase_read_io_threads = 4; -long innobase_write_io_threads = 4; +ulong innobase_read_io_threads = 4; +ulong innobase_write_io_threads = 4; longlong innobase_page_size = (1LL << 14); /* 16KB */ char* innobase_buffer_pool_filename = NULL; @@ -1879,8 +1879,8 @@ static bool innodb_init_param() srv_buf_pool_chunk_unit = (ulong)srv_buf_pool_size; srv_n_file_io_threads = (ulint) innobase_file_io_threads; - srv_n_read_io_threads = (ulint) innobase_read_io_threads; - srv_n_write_io_threads = (ulint) innobase_write_io_threads; + srv_n_read_io_threads = innobase_read_io_threads; + srv_n_write_io_threads = innobase_write_io_threads; srv_max_n_open_files = ULINT_UNDEFINED - 5; @@ -3803,7 +3803,7 @@ end: return static_cast<ulong>(max_file_limit); } #else -# define xb_set_max_open_files(x) 0 +# define xb_set_max_open_files(x) 0UL #endif static void stop_backup_threads() |