Merge lp:~laurynas-biveinis/percona-server/BT-16274-bug1105726-5.1 into lp:percona-server/5.1

Proposed by Laurynas Biveinis
Status: Merged
Approved by: Stewart Smith
Approved revision: 520
Merged at revision: 531
Proposed branch: lp:~laurynas-biveinis/percona-server/BT-16274-bug1105726-5.1
Merge into: lp:percona-server/5.1
Diff against target: 189 lines (+29/-20)
11 files modified
Percona-Server/mysql-test/r/percona_server_variables_debug.result (+1/-1)
Percona-Server/mysql-test/r/percona_server_variables_release.result (+1/-1)
Percona-Server/mysql-test/suite/innodb_plugin/r/percona_changed_page_bmp_1105726.result (+3/-0)
Percona-Server/mysql-test/suite/innodb_plugin/r/percona_changed_pages.result (+3/-3)
Percona-Server/mysql-test/suite/innodb_plugin/t/percona_changed_page_bmp_1105726-master.opt (+1/-0)
Percona-Server/mysql-test/suite/innodb_plugin/t/percona_changed_page_bmp_1105726.test (+5/-0)
Percona-Server/mysql-test/suite/innodb_plugin/t/percona_changed_pages.test (+9/-9)
Percona-Server/storage/innodb_plugin/handler/ha_innodb.cc (+2/-2)
Percona-Server/storage/innodb_plugin/handler/i_s.cc (+2/-2)
Percona-Server/storage/innodb_plugin/include/srv0srv.h (+1/-1)
Percona-Server/storage/innodb_plugin/srv/srv0srv.c (+1/-1)
To merge this branch: bzr merge lp:~laurynas-biveinis/percona-server/BT-16274-bug1105726-5.1
Reviewer Review Type Date Requested Status
Stewart Smith (community) Approve
George Ormond Lorch III g2 Approve
Review via email: mp+145395@code.launchpad.net
To post a comment you must log in.
Revision history for this message
George Ormond Lorch III (gl-az) :
review: Approve (g2)
Revision history for this message
Stewart Smith (stewart) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Percona-Server/mysql-test/r/percona_server_variables_debug.result'
2--- Percona-Server/mysql-test/r/percona_server_variables_debug.result 2013-01-03 00:03:10 +0000
3+++ Percona-Server/mysql-test/r/percona_server_variables_debug.result 2013-01-29 15:18:22 +0000
4@@ -87,7 +87,6 @@
5 INNODB_BUFFER_POOL_SHM_CHECKSUM
6 INNODB_BUFFER_POOL_SHM_KEY
7 INNODB_BUFFER_POOL_SIZE
8-INNODB_CHANGED_PAGES_LIMIT
9 INNODB_CHANGE_BUFFERING
10 INNODB_CHANGE_BUFFERING_DEBUG
11 INNODB_CHECKPOINT_AGE_TARGET
12@@ -130,6 +129,7 @@
13 INNODB_LOG_FILE_SIZE
14 INNODB_LOG_GROUP_HOME_DIR
15 INNODB_MAX_BITMAP_FILE_SIZE
16+INNODB_MAX_CHANGED_PAGES
17 INNODB_MAX_DIRTY_PAGES_PCT
18 INNODB_MAX_PURGE_LAG
19 INNODB_MIRRORED_LOG_GROUPS
20
21=== modified file 'Percona-Server/mysql-test/r/percona_server_variables_release.result'
22--- Percona-Server/mysql-test/r/percona_server_variables_release.result 2012-11-25 09:29:43 +0000
23+++ Percona-Server/mysql-test/r/percona_server_variables_release.result 2013-01-29 15:18:22 +0000
24@@ -85,7 +85,6 @@
25 INNODB_BUFFER_POOL_SHM_CHECKSUM
26 INNODB_BUFFER_POOL_SHM_KEY
27 INNODB_BUFFER_POOL_SIZE
28-INNODB_CHANGED_PAGES_LIMIT
29 INNODB_CHANGE_BUFFERING
30 INNODB_CHECKPOINT_AGE_TARGET
31 INNODB_CHECKSUMS
32@@ -127,6 +126,7 @@
33 INNODB_LOG_FILE_SIZE
34 INNODB_LOG_GROUP_HOME_DIR
35 INNODB_MAX_BITMAP_FILE_SIZE
36+INNODB_MAX_CHANGED_PAGES
37 INNODB_MAX_DIRTY_PAGES_PCT
38 INNODB_MAX_PURGE_LAG
39 INNODB_MIRRORED_LOG_GROUPS
40
41=== added file 'Percona-Server/mysql-test/suite/innodb_plugin/r/percona_changed_page_bmp_1105726.result'
42--- Percona-Server/mysql-test/suite/innodb_plugin/r/percona_changed_page_bmp_1105726.result 1970-01-01 00:00:00 +0000
43+++ Percona-Server/mysql-test/suite/innodb_plugin/r/percona_changed_page_bmp_1105726.result 2013-01-29 15:18:22 +0000
44@@ -0,0 +1,3 @@
45+SELECT 2+2;
46+2+2
47+4
48
49=== modified file 'Percona-Server/mysql-test/suite/innodb_plugin/r/percona_changed_pages.result'
50--- Percona-Server/mysql-test/suite/innodb_plugin/r/percona_changed_pages.result 2013-01-22 16:28:47 +0000
51+++ Percona-Server/mysql-test/suite/innodb_plugin/r/percona_changed_pages.result 2013-01-29 15:18:22 +0000
52@@ -144,13 +144,13 @@
53 SELECT @r2_r3_pages+@r3_r4_pages=@r2_r4_pages AS should_be_1;
54 should_be_1
55 1
56-SET GLOBAL INNODB_CHANGED_PAGES_LIMIT = 1;
57+SET GLOBAL INNODB_MAX_CHANGED_PAGES = 1;
58 SELECT COUNT(*) FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES;
59 COUNT(*)
60 1
61-SET GLOBAL INNODB_CHANGED_PAGES_LIMIT = 5;
62+SET GLOBAL INNODB_MAX_CHANGED_PAGES = 5;
63 SELECT COUNT(*) FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES;
64 COUNT(*)
65 5
66-SET GLOBAL INNODB_CHANGED_PAGES_LIMIT = 1000000;
67+SET GLOBAL INNODB_MAX_CHANGED_PAGES = 1000000;
68 DROP TABLE T1;
69
70=== added file 'Percona-Server/mysql-test/suite/innodb_plugin/t/percona_changed_page_bmp_1105726-master.opt'
71--- Percona-Server/mysql-test/suite/innodb_plugin/t/percona_changed_page_bmp_1105726-master.opt 1970-01-01 00:00:00 +0000
72+++ Percona-Server/mysql-test/suite/innodb_plugin/t/percona_changed_page_bmp_1105726-master.opt 2013-01-29 15:18:22 +0000
73@@ -0,0 +1,1 @@
74+--innodb_track_changed_pages=1 --innodb_changed_pages=FORCE
75
76=== added file 'Percona-Server/mysql-test/suite/innodb_plugin/t/percona_changed_page_bmp_1105726.test'
77--- Percona-Server/mysql-test/suite/innodb_plugin/t/percona_changed_page_bmp_1105726.test 1970-01-01 00:00:00 +0000
78+++ Percona-Server/mysql-test/suite/innodb_plugin/t/percona_changed_page_bmp_1105726.test 2013-01-29 15:18:22 +0000
79@@ -0,0 +1,5 @@
80+# Test that there is no conflict between the I_S plugin and the changed page bitmap option names (LP:1105726)
81+--source include/have_innodb_plugin.inc
82+
83+# If the bug is not present, server starts
84+SELECT 2+2;
85
86=== modified file 'Percona-Server/mysql-test/suite/innodb_plugin/t/percona_changed_pages.test'
87--- Percona-Server/mysql-test/suite/innodb_plugin/t/percona_changed_pages.test 2013-01-22 16:28:47 +0000
88+++ Percona-Server/mysql-test/suite/innodb_plugin/t/percona_changed_pages.test 2013-01-29 15:18:22 +0000
89@@ -12,7 +12,7 @@
90 DROP TABLE IF EXISTS T1;
91 --enable_warnings
92
93-let $old_changed_pages_limit= `SELECT @@GLOBAL.INNODB_CHANGED_PAGES_LIMIT`;
94+let $old_max_changed_pages= `SELECT @@GLOBAL.INNODB_MAX_CHANGED_PAGES`;
95
96 # In order to test multiple bitmap file support we need to ensure that two things
97 # happen: 1) InnoDB checkpoints; 2) bitmap file rotation. The best way to ensure
98@@ -121,7 +121,7 @@
99 LIMIT 1);
100 --enable_result_log
101
102-SET GLOBAL INNODB_CHANGED_PAGES_LIMIT = 0;
103+SET GLOBAL INNODB_MAX_CHANGED_PAGES = 0;
104 --echo Total number of changed pages is smaller than reasonable limit (should be 1):
105 eval SELECT COUNT(DISTINCT PAGE_ID) < 10
106 FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES
107@@ -254,12 +254,12 @@
108 # Check how limit for maximum rows count works #
109 ################################################
110
111-SET GLOBAL INNODB_CHANGED_PAGES_LIMIT = 1;
112-SELECT COUNT(*) FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES;
113-
114-SET GLOBAL INNODB_CHANGED_PAGES_LIMIT = 5;
115-SELECT COUNT(*) FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES;
116-
117-eval SET GLOBAL INNODB_CHANGED_PAGES_LIMIT = $old_changed_pages_limit;
118+SET GLOBAL INNODB_MAX_CHANGED_PAGES = 1;
119+SELECT COUNT(*) FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES;
120+
121+SET GLOBAL INNODB_MAX_CHANGED_PAGES = 5;
122+SELECT COUNT(*) FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES;
123+
124+eval SET GLOBAL INNODB_MAX_CHANGED_PAGES = $old_max_changed_pages;
125
126 DROP TABLE T1;
127
128=== modified file 'Percona-Server/storage/innodb_plugin/handler/ha_innodb.cc'
129--- Percona-Server/storage/innodb_plugin/handler/ha_innodb.cc 2013-01-22 16:28:47 +0000
130+++ Percona-Server/storage/innodb_plugin/handler/ha_innodb.cc 2013-01-29 15:18:22 +0000
131@@ -12166,7 +12166,7 @@
132 "The maximum size of changed page bitmap files",
133 NULL, NULL, 100*1024*1024ULL, 4096ULL, ULONGLONG_MAX, 0);
134
135-static MYSQL_SYSVAR_ULONGLONG(changed_pages_limit, srv_changed_pages_limit,
136+static MYSQL_SYSVAR_ULONGLONG(max_changed_pages, srv_max_changed_pages,
137 PLUGIN_VAR_RQCMDARG,
138 "The maximum number of rows for "
139 "INFORMATION_SCHEMA.INNODB_CHANGED_PAGES table, "
140@@ -12431,7 +12431,7 @@
141 MYSQL_SYSVAR(change_buffering),
142 MYSQL_SYSVAR(track_changed_pages),
143 MYSQL_SYSVAR(max_bitmap_file_size),
144- MYSQL_SYSVAR(changed_pages_limit),
145+ MYSQL_SYSVAR(max_changed_pages),
146 #if defined UNIV_DEBUG || defined UNIV_IBUF_DEBUG
147 MYSQL_SYSVAR(change_buffering_debug),
148 #endif /* UNIV_DEBUG || UNIV_IBUF_DEBUG */
149
150=== modified file 'Percona-Server/storage/innodb_plugin/handler/i_s.cc'
151--- Percona-Server/storage/innodb_plugin/handler/i_s.cc 2013-01-18 03:33:06 +0000
152+++ Percona-Server/storage/innodb_plugin/handler/i_s.cc 2013-01-29 15:18:22 +0000
153@@ -3976,8 +3976,8 @@
154 }
155
156 while(log_online_bitmap_iterator_next(&i) &&
157- (!srv_changed_pages_limit ||
158- output_rows_num < srv_changed_pages_limit) &&
159+ (!srv_max_changed_pages ||
160+ output_rows_num < srv_max_changed_pages) &&
161 /*
162 There is no need to compare both start LSN and end LSN fields
163 with maximum value. It's enough to compare only start LSN.
164
165=== modified file 'Percona-Server/storage/innodb_plugin/include/srv0srv.h'
166--- Percona-Server/storage/innodb_plugin/include/srv0srv.h 2012-12-14 22:29:39 +0000
167+++ Percona-Server/storage/innodb_plugin/include/srv0srv.h 2013-01-29 15:18:22 +0000
168@@ -138,7 +138,7 @@
169 extern ib_uint64_t srv_max_bitmap_file_size;
170
171 extern
172-ulonglong srv_changed_pages_limit;
173+ulonglong srv_max_changed_pages;
174
175 extern ibool srv_auto_extend_last_data_file;
176 extern ulint srv_last_file_size_max;
177
178=== modified file 'Percona-Server/storage/innodb_plugin/srv/srv0srv.c'
179--- Percona-Server/storage/innodb_plugin/srv/srv0srv.c 2012-12-14 22:29:39 +0000
180+++ Percona-Server/storage/innodb_plugin/srv/srv0srv.c 2013-01-29 15:18:22 +0000
181@@ -166,7 +166,7 @@
182
183 UNIV_INTERN ib_uint64_t srv_max_bitmap_file_size = 100 * 1024 * 1024;
184
185-UNIV_INTERN ulonglong srv_changed_pages_limit = 0;
186+UNIV_INTERN ulonglong srv_max_changed_pages = 0;
187
188 /** When TRUE, fake change transcations take S rather than X row locks.
189 When FALSE, row locks are not taken at all. */

Subscribers

People subscribed via source and target branches