Commit 714d9bc5 authored by unknown's avatar unknown

merge from mysql-5.1

parents 697029d1 92989fde
...@@ -1648,19 +1648,6 @@ recv_recover_page_func( ...@@ -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( ...@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment