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

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

  1. BT-16274-bug1105726-5.5
  2. Merge into 5.5
Proposed by Laurynas Biveinis
Status: Merged
Approved by: Stewart Smith
Approved revision: no longer in the source branch.
Merged at revision: 440
Proposed branch: lp:~laurynas-biveinis/percona-server/BT-16274-bug1105726-5.5
Merge into: lp:percona-server/5.5
Diff against target: 211 lines (+35/-26)
12 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/r/percona_changed_page_bmp_1105726.result (+3/-0)
Percona-Server/mysql-test/suite/innodb/r/percona_changed_pages.result (+3/-3)
Percona-Server/mysql-test/suite/innodb/t/percona_changed_page_bmp_1105726-master.opt (+1/-0)
Percona-Server/mysql-test/suite/innodb/t/percona_changed_page_bmp_1105726.test (+5/-0)
Percona-Server/mysql-test/suite/innodb/t/percona_changed_pages.test (+9/-9)
Percona-Server/mysql-test/suite/sys_vars/r/all_vars.result (+6/-6)
Percona-Server/storage/innobase/handler/ha_innodb.cc (+2/-2)
Percona-Server/storage/innobase/handler/i_s.cc (+2/-2)
Percona-Server/storage/innobase/include/srv0srv.h (+1/-1)
Percona-Server/storage/innobase/srv/srv0srv.c (+1/-1)
To merge this branch: bzr merge lp:~laurynas-biveinis/percona-server/BT-16274-bug1105726-5.5
Reviewer Review Type Date Requested Status
Stewart Smith (community) Approve
George Ormond Lorch III (community) g2 Approve
Review via email: mp+145398@code.launchpad.net

Description of the change

Merge bug 1105726 fix from 5.1.
BT 16274
http://jenkins.percona.com/job/percona-server-5.5-param/645/

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 23:45:16 +0000
3+++ Percona-Server/mysql-test/r/percona_server_variables_debug.result 2013-01-29 15:21:29 +0000
4@@ -93,7 +93,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@@ -135,6 +134,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_MERGE_SORT_BLOCK_SIZE
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:30:58 +0000
23+++ Percona-Server/mysql-test/r/percona_server_variables_release.result 2013-01-29 15:21:29 +0000
24@@ -91,7 +91,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@@ -132,6 +131,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_MERGE_SORT_BLOCK_SIZE
40
41=== added file 'Percona-Server/mysql-test/suite/innodb/r/percona_changed_page_bmp_1105726.result'
42--- Percona-Server/mysql-test/suite/innodb/r/percona_changed_page_bmp_1105726.result 1970-01-01 00:00:00 +0000
43+++ Percona-Server/mysql-test/suite/innodb/r/percona_changed_page_bmp_1105726.result 2013-01-29 15:21:29 +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/r/percona_changed_pages.result'
50--- Percona-Server/mysql-test/suite/innodb/r/percona_changed_pages.result 2013-01-22 16:32:44 +0000
51+++ Percona-Server/mysql-test/suite/innodb/r/percona_changed_pages.result 2013-01-29 15:21:29 +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/t/percona_changed_page_bmp_1105726-master.opt'
71--- Percona-Server/mysql-test/suite/innodb/t/percona_changed_page_bmp_1105726-master.opt 1970-01-01 00:00:00 +0000
72+++ Percona-Server/mysql-test/suite/innodb/t/percona_changed_page_bmp_1105726-master.opt 2013-01-29 15:21:29 +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/t/percona_changed_page_bmp_1105726.test'
77--- Percona-Server/mysql-test/suite/innodb/t/percona_changed_page_bmp_1105726.test 1970-01-01 00:00:00 +0000
78+++ Percona-Server/mysql-test/suite/innodb/t/percona_changed_page_bmp_1105726.test 2013-01-29 15:21:29 +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.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/t/percona_changed_pages.test'
87--- Percona-Server/mysql-test/suite/innodb/t/percona_changed_pages.test 2013-01-22 16:32:44 +0000
88+++ Percona-Server/mysql-test/suite/innodb/t/percona_changed_pages.test 2013-01-29 15:21:29 +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/mysql-test/suite/sys_vars/r/all_vars.result'
129--- Percona-Server/mysql-test/suite/sys_vars/r/all_vars.result 2012-09-28 01:36:45 +0000
130+++ Percona-Server/mysql-test/suite/sys_vars/r/all_vars.result 2013-01-29 15:21:29 +0000
131@@ -10,11 +10,11 @@
132 select variable_name as `There should be *no* variables listed below:` from t2
133 left join t1 on variable_name=test_name where test_name is null order by 1;
134 There should be *no* variables listed below:
135-INNODB_CHANGED_PAGES_LIMIT
136-INNODB_CHANGED_PAGES_LIMIT
137-INNODB_FAKE_CHANGES
138-INNODB_FAKE_CHANGES
139-INNODB_KILL_IDLE_TRANSACTION
140-INNODB_KILL_IDLE_TRANSACTION
141+INNODB_FAKE_CHANGES
142+INNODB_FAKE_CHANGES
143+INNODB_KILL_IDLE_TRANSACTION
144+INNODB_KILL_IDLE_TRANSACTION
145+INNODB_MAX_CHANGED_PAGES
146+INNODB_MAX_CHANGED_PAGES
147 drop table t1;
148 drop table t2;
149
150=== modified file 'Percona-Server/storage/innobase/handler/ha_innodb.cc'
151--- Percona-Server/storage/innobase/handler/ha_innodb.cc 2013-01-22 16:32:44 +0000
152+++ Percona-Server/storage/innobase/handler/ha_innodb.cc 2013-01-29 15:21:29 +0000
153@@ -12880,7 +12880,7 @@
154 "The maximum size of changed page bitmap files",
155 NULL, NULL, 100*1024*1024ULL, 4096ULL, ULONGLONG_MAX, 0);
156
157-static MYSQL_SYSVAR_ULONGLONG(changed_pages_limit, srv_changed_pages_limit,
158+static MYSQL_SYSVAR_ULONGLONG(max_changed_pages, srv_max_changed_pages,
159 PLUGIN_VAR_RQCMDARG,
160 "The maximum number of rows for "
161 "INFORMATION_SCHEMA.INNODB_CHANGED_PAGES table, "
162@@ -13181,7 +13181,7 @@
163 MYSQL_SYSVAR(change_buffering),
164 MYSQL_SYSVAR(track_changed_pages),
165 MYSQL_SYSVAR(max_bitmap_file_size),
166- MYSQL_SYSVAR(changed_pages_limit),
167+ MYSQL_SYSVAR(max_changed_pages),
168 #if defined UNIV_DEBUG || defined UNIV_IBUF_DEBUG
169 MYSQL_SYSVAR(change_buffering_debug),
170 #endif /* UNIV_DEBUG || UNIV_IBUF_DEBUG */
171
172=== modified file 'Percona-Server/storage/innobase/handler/i_s.cc'
173--- Percona-Server/storage/innobase/handler/i_s.cc 2013-01-18 03:34:53 +0000
174+++ Percona-Server/storage/innobase/handler/i_s.cc 2013-01-29 15:21:29 +0000
175@@ -7496,8 +7496,8 @@
176 }
177
178 while(log_online_bitmap_iterator_next(&i) &&
179- (!srv_changed_pages_limit ||
180- output_rows_num < srv_changed_pages_limit) &&
181+ (!srv_max_changed_pages ||
182+ output_rows_num < srv_max_changed_pages) &&
183 /*
184 There is no need to compare both start LSN and end LSN fields
185 with maximum value. It's enough to compare only start LSN.
186
187=== modified file 'Percona-Server/storage/innobase/include/srv0srv.h'
188--- Percona-Server/storage/innobase/include/srv0srv.h 2012-12-14 23:35:37 +0000
189+++ Percona-Server/storage/innobase/include/srv0srv.h 2013-01-29 15:21:29 +0000
190@@ -145,7 +145,7 @@
191 extern ib_uint64_t srv_max_bitmap_file_size;
192
193 extern
194-ulonglong srv_changed_pages_limit;
195+ulonglong srv_max_changed_pages;
196
197 extern ibool srv_auto_extend_last_data_file;
198 extern ulint srv_last_file_size_max;
199
200=== modified file 'Percona-Server/storage/innobase/srv/srv0srv.c'
201--- Percona-Server/storage/innobase/srv/srv0srv.c 2012-12-14 23:35:37 +0000
202+++ Percona-Server/storage/innobase/srv/srv0srv.c 2013-01-29 15:21:29 +0000
203@@ -181,7 +181,7 @@
204
205 UNIV_INTERN ib_uint64_t srv_max_bitmap_file_size = 100 * 1024 * 1024;
206
207-UNIV_INTERN ulonglong srv_changed_pages_limit = 0;
208+UNIV_INTERN ulonglong srv_max_changed_pages = 0;
209
210 /** When TRUE, fake change transcations take S rather than X row locks.
211 When FALSE, row locks are not taken at all. */

Subscribers

People subscribed via source and target branches