diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-20 09:12:16 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-20 09:12:16 +0300 |
| commit | de0e7cd72a6e071aba686178a8ff461dd5a757f5 (patch) | |
| tree | 9beb054fb01d917e1359b60debce629056c6ef4b /extra/mariabackup | |
| parent | 90c8d773ed0ea7de5e735e836e1e33a190711f17 (diff) | |
| parent | a79c25789474f32097e083d3b4953927c04909bc (diff) | |
| download | mariadb-git-de0e7cd72a6e071aba686178a8ff461dd5a757f5.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'extra/mariabackup')
| -rw-r--r-- | extra/mariabackup/xtrabackup.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/extra/mariabackup/xtrabackup.cc b/extra/mariabackup/xtrabackup.cc index 277e8b67cf0..0529cb18f23 100644 --- a/extra/mariabackup/xtrabackup.cc +++ b/extra/mariabackup/xtrabackup.cc @@ -249,6 +249,12 @@ my_bool innobase_locks_unsafe_for_binlog; my_bool innobase_rollback_on_timeout; my_bool innobase_create_status_file; +/* The following counter is used to convey information to InnoDB +about server activity: in selects it is not sensible to call +srv_active_wake_master_thread after each fetch or search, we only do +it every INNOBASE_WAKE_INTERVAL'th step. */ + +#define INNOBASE_WAKE_INTERVAL 32 ulong innobase_active_counter = 0; #ifndef _WIN32 @@ -2006,10 +2012,6 @@ static bool innodb_init_param() srv_undo_dir = (char*) "."; } - log_checksum_algorithm_ptr = innodb_log_checksums || srv_encrypt_log - ? log_block_calc_checksum_crc32 - : log_block_calc_checksum_none; - #ifdef _WIN32 srv_use_native_aio = TRUE; #endif |