diff options
| author | Seppo Jaakola <seppo.jaakola@codership.com> | 2013-06-15 16:15:17 +0300 |
|---|---|---|
| committer | Seppo Jaakola <seppo.jaakola@codership.com> | 2013-06-15 16:15:17 +0300 |
| commit | 7d2a0e9da45fb66659493767fa3adda1e7ef499d (patch) | |
| tree | ea89cd63ced516b37a732d91606c8ba328b88007 /storage/xtradb/os | |
| parent | 3fa8559debb41102089788bcbe575d887a25dffd (diff) | |
| download | mariadb-git-7d2a0e9da45fb66659493767fa3adda1e7ef499d.tar.gz | |
References lp:1108035 - merged fix from http://bazaar.launchpad.net/~percona-core/percona-xtradb-cluster/release-5.5.31/revision/394
Diffstat (limited to 'storage/xtradb/os')
| -rw-r--r-- | storage/xtradb/os/os0proc.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/storage/xtradb/os/os0proc.c b/storage/xtradb/os/os0proc.c index c9ee707e923..9ce04602082 100644 --- a/storage/xtradb/os/os0proc.c +++ b/storage/xtradb/os/os0proc.c @@ -57,6 +57,9 @@ UNIV_INTERN ibool os_use_large_pages; /* Large page size. This may be a boot-time option on some platforms */ UNIV_INTERN ulint os_large_page_size; +#ifdef WITH_WSREP +extern my_bool wsrep_recovery; +#endif /* WITH_WSREP */ /****************************************************************//** Converts the current process id to a number. It is not guaranteed that the number is unique. In Linux returns the 'process number' of the current @@ -183,6 +186,12 @@ skip: # else size = UNIV_PAGE_SIZE; # endif +#ifdef WITH_WSREP + /* Don't populate if wsrep_recovery is ON */ + if (wsrep_recovery) { + populate = FALSE; + } +#endif /* WITH_WSREP */ /* Align block size to system page size */ ut_ad(ut_is_2pow(size)); size = *n = ut_2pow_round(*n + (size - 1), size); |