Percona Server moved to https://jira.percona.com/projects/PS

Merge lp:~laurynas-biveinis/percona-server/bug1382336-5.6 into lp:percona-server/5.6

  1. bug1382336-5.6
  2. Merge into 5.6
Proposed by Laurynas Biveinis
Status: Merged
Approved by: Laurynas Biveinis
Approved revision: no longer in the source branch.
Merged at revision: 682
Proposed branch: lp:~laurynas-biveinis/percona-server/bug1382336-5.6
Merge into: lp:percona-server/5.6
Diff against target: 64 lines (+38/-1)
4 files modified
mysql-test/suite/innodb/r/percona_changed_page_bmp_requests_debug.result (+9/-0)
mysql-test/suite/innodb/t/percona_changed_page_bmp_requests_debug-master.opt (+1/-0)
mysql-test/suite/innodb/t/percona_changed_page_bmp_requests_debug.test (+27/-0)
storage/innobase/log/log0online.cc (+1/-1)
To merge this branch: bzr merge lp:~laurynas-biveinis/percona-server/bug1382336-5.6
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) Approve
Review via email: mp+238658@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Laurynas Biveinis (laurynas-biveinis) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== added file 'mysql-test/suite/innodb/r/percona_changed_page_bmp_requests_debug.result'
--- mysql-test/suite/innodb/r/percona_changed_page_bmp_requests_debug.result 1970-01-01 00:00:00 +0000
+++ mysql-test/suite/innodb/r/percona_changed_page_bmp_requests_debug.result 2014-10-17 06:11:15 +0000
@@ -0,0 +1,9 @@
1CREATE TABLE t1(a INT) ENGINE=InnoDB;
2INSERT INTO t1 VALUES (10);
3SET @@GLOBAL.innodb_log_checkpoint_now=TRUE;
4SET @@GLOBAL.innodb_track_redo_log_now=TRUE;
5PURGE CHANGED_PAGE_BITMAPS BEFORE CURRENT_LSN;
6INSERT INTO t1 VALUES (20);
7SET @@GLOBAL.innodb_log_checkpoint_now=TRUE;
8SET @@GLOBAL.innodb_track_redo_log_now=TRUE;
9DROP TABLE t1;
010
=== added file 'mysql-test/suite/innodb/t/percona_changed_page_bmp_requests_debug-master.opt'
--- mysql-test/suite/innodb/t/percona_changed_page_bmp_requests_debug-master.opt 1970-01-01 00:00:00 +0000
+++ mysql-test/suite/innodb/t/percona_changed_page_bmp_requests_debug-master.opt 2014-10-17 06:11:15 +0000
@@ -0,0 +1,1 @@
1--innodb_track_changed_pages=TRUE
02
=== added file 'mysql-test/suite/innodb/t/percona_changed_page_bmp_requests_debug.test'
--- mysql-test/suite/innodb/t/percona_changed_page_bmp_requests_debug.test 1970-01-01 00:00:00 +0000
+++ mysql-test/suite/innodb/t/percona_changed_page_bmp_requests_debug.test 2014-10-17 06:11:15 +0000
@@ -0,0 +1,27 @@
1#
2# Tests for changed page tracking user requests that need a debug build
3#
4--source include/have_innodb.inc
5--source include/have_debug.inc
6
7#
8# Bug 1382336: Purging bitmaps exactly up to the last tracked LSN aborts change tracking
9#
10CREATE TABLE t1(a INT) ENGINE=InnoDB;
11
12INSERT INTO t1 VALUES (10);
13
14SET @@GLOBAL.innodb_log_checkpoint_now=TRUE;
15SET @@GLOBAL.innodb_track_redo_log_now=TRUE;
16
17let $current_lsn = query_get_value(SHOW STATUS LIKE 'innodb_lsn_current', Value, 1);
18
19--replace_regex /[0-9]+/CURRENT_LSN/
20eval PURGE CHANGED_PAGE_BITMAPS BEFORE $current_lsn;
21
22INSERT INTO t1 VALUES (20);
23
24SET @@GLOBAL.innodb_log_checkpoint_now=TRUE;
25SET @@GLOBAL.innodb_track_redo_log_now=TRUE;
26
27DROP TABLE t1;
028
=== modified file 'storage/innobase/log/log0online.cc'
--- storage/innobase/log/log0online.cc 2014-08-22 13:31:49 +0000
+++ storage/innobase/log/log0online.cc 2014-10-17 06:11:15 +0000
@@ -1808,7 +1808,7 @@
1808 return TRUE;1808 return TRUE;
1809 }1809 }
18101810
1811 if (srv_track_changed_pages && lsn >= log_bmp_sys->end_lsn) {1811 if (srv_track_changed_pages && lsn > log_bmp_sys->end_lsn) {
1812 /* If we have to delete the current output file, close it1812 /* If we have to delete the current output file, close it
1813 first. */1813 first. */
1814 os_file_close(log_bmp_sys->out.file);1814 os_file_close(log_bmp_sys->out.file);

Subscribers

People subscribed via source and target branches