database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-10-23 18:49:29 +03:00
Code Activity

References lp:1108035 - merged fix from http://bazaar.launchpad.net/~percona-core/percona-xtradb-cluster/release-5.5.31/revision/394

Browse Source
This commit is contained in:
Seppo Jaakola
2013-06-15 16:15:17 +03:00
parent 3fa8559deb
commit 7d2a0e9da4
2 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
storage/xtradb/os/os0proc.c
View File

@@ -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);

12
storage/xtradb/srv/srv0start.c
View File

@@ -90,7 +90,10 @@ Created 2/16/1996 Heikki Tuuri
# include "zlib.h" /* for ZLIB_VERSION */
# include "buf0lru.h" /* for buf_LRU_file_restore() */
/** Log sequence number immediately after startup */
#ifdef WITH_WSREP
extern my_bool wsrep_recovery;
#endif /* WITH_WSREP */
/** Log sequence number immediately after startup */
UNIV_INTERN ib_uint64_t srv_start_lsn;
/** Log sequence number at shutdown */
UNIV_INTERN ib_uint64_t srv_shutdown_lsn;
@@ -2058,6 +2061,10 @@ innobase_start_or_create_for_mysql(void)
os_thread_create(&srv_monitor_thread, NULL,
thread_ids + 4 + SRV_MAX_N_IO_THREADS);
#ifdef WITH_WSREP
/* Don't start the LRU thread when recovery is on */
if (!wsrep_recovery) {
#endif /* WITH_WSREP */
/* Create the thread which automaticaly dumps/restore buffer pool */
os_thread_create(&srv_LRU_dump_restore_thread, NULL,
thread_ids + 5 + SRV_MAX_N_IO_THREADS);
@@ -2066,6 +2073,9 @@ innobase_start_or_create_for_mysql(void)
synchronously */
if (srv_auto_lru_dump && srv_blocking_lru_restore)
buf_LRU_file_restore();
#ifdef WITH_WSREP
}
#endif /* WITH_WSREP */
srv_is_being_started = FALSE;