mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-27 17:33:44 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

branches/zip: recv_sys_init(): Remove a compile-time constant parameter.

Browse source
This commit is contained in:
marko 2009-03-20 12:56:19 +00:00
parent f2a70c2a4b
commit cc6e72fc36
4 changed files with 11 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -1,7 +1,8 @@
2009-03-20 The InnoDB Team
* buf/buf0buf.c, include/log0recv.h, log/log0recv.c:
Remove the compile-time constant parameters of recv_recover_page().
Remove the compile-time constant parameters of
recv_recover_page() and recv_sys_init().
2009-03-20 The InnoDB Team

2
include/log0recv.h
View file

@ -208,8 +208,6 @@ UNIV_INTERN
void
recv_sys_init(
/*==========*/
ibool recover_from_backup, /* in: TRUE if this is called
to recover from a hot backup */
ulint available_memory); /* in: available memory in bytes */
/***********************************************************************
Empties the hash table of stored log records, applying them to appropriate

2
log/log0log.c
View file

@ -844,7 +844,7 @@ log_init(void)
#ifdef UNIV_LOG_DEBUG
recv_sys_create();
recv_sys_init(FALSE, buf_pool_get_curr_size());
recv_sys_init(buf_pool_get_curr_size());
recv_sys->parse_start_lsn = log_sys->lsn;
recv_sys->scanned_lsn = log_sys->lsn;

18
log/log0recv.c
View file

@ -154,8 +154,6 @@ UNIV_INTERN
void
recv_sys_init(
/*==========*/
ibool recover_from_backup, /* in: TRUE if this is called
to recover from a hot backup */
ulint available_memory) /* in: available memory in bytes */
{
if (recv_sys->heap != NULL) {
@ -165,12 +163,12 @@ recv_sys_init(
mutex_enter(&(recv_sys->mutex));
if (!recover_from_backup) {
recv_sys->heap = mem_heap_create_in_buffer(256);
} else {
recv_sys->heap = mem_heap_create(256);
recv_is_from_backup = TRUE;
}
#ifndef UNIV_HOTBACKUP
recv_sys->heap = mem_heap_create_in_buffer(256);
#else /* !UNIV_HOTBACKUP */
recv_sys->heap = mem_heap_create(256);
recv_is_from_backup = TRUE;
#endif /* !UNIV_HOTBACKUP */
recv_sys->buf = ut_malloc(RECV_PARSING_BUF_SIZE);
recv_sys->len = 0;
@ -2597,7 +2595,7 @@ recv_recovery_from_checkpoint_start_func(
if (TYPE_CHECKPOINT) {
recv_sys_create();
recv_sys_init(FALSE, buf_pool_get_curr_size());
recv_sys_init(buf_pool_get_curr_size());
}
if (srv_force_recovery >= SRV_FORCE_NO_LOG_REDO) {
@ -3369,7 +3367,7 @@ recv_recovery_from_archive_start(
ut_a(0);
recv_sys_create();
recv_sys_init(FALSE, buf_pool_get_curr_size());
recv_sys_init(buf_pool_get_curr_size());
recv_recovery_on = TRUE;
recv_recovery_from_backup_on = TRUE;