mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-16 03:47:17 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge 10.0.14 into 10.1

Browse source
This commit is contained in:
Sergei Golubchik 2014-10-15 12:59:13 +02:00
commit f62c12b405
2115 changed files with 88123 additions and 80328 deletions
Download patch file Download diff file Expand all files Collapse all files

9
storage/xtradb/handler/i_s.cc
View file

@ -8287,6 +8287,15 @@ i_s_innodb_changed_pages_fill(
limit_lsn_range_from_condition(table, cond, &min_lsn,
&max_lsn);
}
/* If the log tracker is running and our max_lsn > current tracked LSN,
cap the max lsn so that we don't try to read any partial runs as the
tracked LSN advances. */
if (srv_track_changed_pages) {
ib_uint64_t tracked_lsn = log_get_tracked_lsn();
if (max_lsn > tracked_lsn)
max_lsn = tracked_lsn;
}
if (!log_online_bitmap_iterator_init(&i, min_lsn, max_lsn)) {
my_error(ER_CANT_FIND_SYSTEM_REC, MYF(0));