database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

merge from mysql-5.1

Browse Source
This commit is contained in:
unknown
2013-04-30 20:40:38 +02:00
parent 697029d12d 92989fdeed
commit 714d9bc5ce
1 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
storage/innobase/log/log0recv.c
View File

@ -1648,19 +1648,6 @@ recv_recover_page_func(
} }
#endif /* UNIV_ZIP_DEBUG */ #endif /* UNIV_ZIP_DEBUG */
mutex_enter(&(recv_sys->mutex));
if (recv_max_page_lsn < page_lsn) {
recv_max_page_lsn = page_lsn;
}
recv_addr->state = RECV_PROCESSED;
ut_a(recv_sys->n_addrs);
recv_sys->n_addrs--;
mutex_exit(&(recv_sys->mutex));
#ifndef UNIV_HOTBACKUP #ifndef UNIV_HOTBACKUP
if (modification_to_page) { if (modification_to_page) {
ut_a(block); ut_a(block);
@ -1677,6 +1664,20 @@ recv_recover_page_func(
mtr.modifications = FALSE; mtr.modifications = FALSE;
mtr_commit(&mtr); mtr_commit(&mtr);
mutex_enter(&(recv_sys->mutex));
if (recv_max_page_lsn < page_lsn) {
recv_max_page_lsn = page_lsn;
}
recv_addr->state = RECV_PROCESSED;
ut_a(recv_sys->n_addrs);
recv_sys->n_addrs--;
mutex_exit(&(recv_sys->mutex));
} }
#ifndef UNIV_HOTBACKUP #ifndef UNIV_HOTBACKUP