diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-05-19 08:53:58 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-05-19 12:29:37 +0300 |
| commit | 13a350ac29eeb43153c7bca65b73b5dfa9f8ffb5 (patch) | |
| tree | b13da72226623745f0607609e2bb3dcaac4a11c6 /extra | |
| parent | d0eb4ee96b32caec1d6bba6dc376016b2bf2ac0f (diff) | |
| parent | 54bb04f7efc1d0842b3d8befb670f5d9f05cb211 (diff) | |
| download | mariadb-git-13a350ac29eeb43153c7bca65b73b5dfa9f8ffb5.tar.gz | |
Merge 10.0 into 10.1
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/mariabackup/xtrabackup.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/extra/mariabackup/xtrabackup.cc b/extra/mariabackup/xtrabackup.cc index 98a1bfb810e..4fe80819622 100644 --- a/extra/mariabackup/xtrabackup.cc +++ b/extra/mariabackup/xtrabackup.cc @@ -3962,6 +3962,7 @@ xtrabackup_backup_func(void) mysql_data_home[0]=FN_CURLIB; // all paths are relative from here mysql_data_home[1]=0; + srv_n_purge_threads = 1; srv_read_only_mode = TRUE; srv_backup_mode = TRUE; @@ -4650,6 +4651,7 @@ xtrabackup_stats_func(int argc, char **argv) mysql_data_home[0]=FN_CURLIB; // all paths are relative from here mysql_data_home[1]=0; + srv_n_purge_threads = 1; /* set read only */ srv_read_only_mode = TRUE; @@ -6407,6 +6409,7 @@ skip_check: /* Create logfiles for recovery from 'xtrabackup_logfile', before start InnoDB */ srv_max_n_threads = 1000; + srv_n_purge_threads = 1; ut_mem_init(); /* temporally dummy value to avoid crash */ srv_page_size_shift = 14; |