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

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

  1. BT-16274-bug1105726-5.1
  2. Merge into 5.1
Proposed by Laurynas Biveinis
Status: Merged
Approved by: Stewart Smith
Approved revision: no longer in the source branch.
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 (community) 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
=== modified file 'Percona-Server/mysql-test/r/percona_server_variables_debug.result'
--- Percona-Server/mysql-test/r/percona_server_variables_debug.result 2013-01-03 00:03:10 +0000
+++ Percona-Server/mysql-test/r/percona_server_variables_debug.result 2013-01-29 15:18:22 +0000
@@ -87,7 +87,6 @@
87INNODB_BUFFER_POOL_SHM_CHECKSUM87INNODB_BUFFER_POOL_SHM_CHECKSUM
88INNODB_BUFFER_POOL_SHM_KEY88INNODB_BUFFER_POOL_SHM_KEY
89INNODB_BUFFER_POOL_SIZE89INNODB_BUFFER_POOL_SIZE
90INNODB_CHANGED_PAGES_LIMIT
91INNODB_CHANGE_BUFFERING90INNODB_CHANGE_BUFFERING
92INNODB_CHANGE_BUFFERING_DEBUG91INNODB_CHANGE_BUFFERING_DEBUG
93INNODB_CHECKPOINT_AGE_TARGET92INNODB_CHECKPOINT_AGE_TARGET
@@ -130,6 +129,7 @@
130INNODB_LOG_FILE_SIZE129INNODB_LOG_FILE_SIZE
131INNODB_LOG_GROUP_HOME_DIR130INNODB_LOG_GROUP_HOME_DIR
132INNODB_MAX_BITMAP_FILE_SIZE131INNODB_MAX_BITMAP_FILE_SIZE
132INNODB_MAX_CHANGED_PAGES
133INNODB_MAX_DIRTY_PAGES_PCT133INNODB_MAX_DIRTY_PAGES_PCT
134INNODB_MAX_PURGE_LAG134INNODB_MAX_PURGE_LAG
135INNODB_MIRRORED_LOG_GROUPS135INNODB_MIRRORED_LOG_GROUPS
136136
=== modified file 'Percona-Server/mysql-test/r/percona_server_variables_release.result'
--- Percona-Server/mysql-test/r/percona_server_variables_release.result 2012-11-25 09:29:43 +0000
+++ Percona-Server/mysql-test/r/percona_server_variables_release.result 2013-01-29 15:18:22 +0000
@@ -85,7 +85,6 @@
85INNODB_BUFFER_POOL_SHM_CHECKSUM85INNODB_BUFFER_POOL_SHM_CHECKSUM
86INNODB_BUFFER_POOL_SHM_KEY86INNODB_BUFFER_POOL_SHM_KEY
87INNODB_BUFFER_POOL_SIZE87INNODB_BUFFER_POOL_SIZE
88INNODB_CHANGED_PAGES_LIMIT
89INNODB_CHANGE_BUFFERING88INNODB_CHANGE_BUFFERING
90INNODB_CHECKPOINT_AGE_TARGET89INNODB_CHECKPOINT_AGE_TARGET
91INNODB_CHECKSUMS90INNODB_CHECKSUMS
@@ -127,6 +126,7 @@
127INNODB_LOG_FILE_SIZE126INNODB_LOG_FILE_SIZE
128INNODB_LOG_GROUP_HOME_DIR127INNODB_LOG_GROUP_HOME_DIR
129INNODB_MAX_BITMAP_FILE_SIZE128INNODB_MAX_BITMAP_FILE_SIZE
129INNODB_MAX_CHANGED_PAGES
130INNODB_MAX_DIRTY_PAGES_PCT130INNODB_MAX_DIRTY_PAGES_PCT
131INNODB_MAX_PURGE_LAG131INNODB_MAX_PURGE_LAG
132INNODB_MIRRORED_LOG_GROUPS132INNODB_MIRRORED_LOG_GROUPS
133133
=== added file 'Percona-Server/mysql-test/suite/innodb_plugin/r/percona_changed_page_bmp_1105726.result'
--- Percona-Server/mysql-test/suite/innodb_plugin/r/percona_changed_page_bmp_1105726.result 1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/innodb_plugin/r/percona_changed_page_bmp_1105726.result 2013-01-29 15:18:22 +0000
@@ -0,0 +1,3 @@
1SELECT 2+2;
22+2
34
04
=== modified file 'Percona-Server/mysql-test/suite/innodb_plugin/r/percona_changed_pages.result'
--- Percona-Server/mysql-test/suite/innodb_plugin/r/percona_changed_pages.result 2013-01-22 16:28:47 +0000
+++ Percona-Server/mysql-test/suite/innodb_plugin/r/percona_changed_pages.result 2013-01-29 15:18:22 +0000
@@ -144,13 +144,13 @@
144SELECT @r2_r3_pages+@r3_r4_pages=@r2_r4_pages AS should_be_1;144SELECT @r2_r3_pages+@r3_r4_pages=@r2_r4_pages AS should_be_1;
145should_be_1145should_be_1
14611461
147SET GLOBAL INNODB_CHANGED_PAGES_LIMIT = 1;147SET GLOBAL INNODB_MAX_CHANGED_PAGES = 1;
148SELECT COUNT(*) FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES;148SELECT COUNT(*) FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES;
149COUNT(*)149COUNT(*)
15011501
151SET GLOBAL INNODB_CHANGED_PAGES_LIMIT = 5;151SET GLOBAL INNODB_MAX_CHANGED_PAGES = 5;
152SELECT COUNT(*) FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES;152SELECT COUNT(*) FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES;
153COUNT(*)153COUNT(*)
15451545
155SET GLOBAL INNODB_CHANGED_PAGES_LIMIT = 1000000;155SET GLOBAL INNODB_MAX_CHANGED_PAGES = 1000000;
156DROP TABLE T1;156DROP TABLE T1;
157157
=== added file 'Percona-Server/mysql-test/suite/innodb_plugin/t/percona_changed_page_bmp_1105726-master.opt'
--- Percona-Server/mysql-test/suite/innodb_plugin/t/percona_changed_page_bmp_1105726-master.opt 1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/innodb_plugin/t/percona_changed_page_bmp_1105726-master.opt 2013-01-29 15:18:22 +0000
@@ -0,0 +1,1 @@
1--innodb_track_changed_pages=1 --innodb_changed_pages=FORCE
02
=== added file 'Percona-Server/mysql-test/suite/innodb_plugin/t/percona_changed_page_bmp_1105726.test'
--- Percona-Server/mysql-test/suite/innodb_plugin/t/percona_changed_page_bmp_1105726.test 1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/innodb_plugin/t/percona_changed_page_bmp_1105726.test 2013-01-29 15:18:22 +0000
@@ -0,0 +1,5 @@
1# Test that there is no conflict between the I_S plugin and the changed page bitmap option names (LP:1105726)
2--source include/have_innodb_plugin.inc
3
4# If the bug is not present, server starts
5SELECT 2+2;
06
=== modified file 'Percona-Server/mysql-test/suite/innodb_plugin/t/percona_changed_pages.test'
--- Percona-Server/mysql-test/suite/innodb_plugin/t/percona_changed_pages.test 2013-01-22 16:28:47 +0000
+++ Percona-Server/mysql-test/suite/innodb_plugin/t/percona_changed_pages.test 2013-01-29 15:18:22 +0000
@@ -12,7 +12,7 @@
12DROP TABLE IF EXISTS T1;12DROP TABLE IF EXISTS T1;
13--enable_warnings13--enable_warnings
1414
15let $old_changed_pages_limit= `SELECT @@GLOBAL.INNODB_CHANGED_PAGES_LIMIT`;15let $old_max_changed_pages= `SELECT @@GLOBAL.INNODB_MAX_CHANGED_PAGES`;
1616
17# In order to test multiple bitmap file support we need to ensure that two things17# In order to test multiple bitmap file support we need to ensure that two things
18# happen: 1) InnoDB checkpoints; 2) bitmap file rotation. The best way to ensure18# happen: 1) InnoDB checkpoints; 2) bitmap file rotation. The best way to ensure
@@ -121,7 +121,7 @@
121 LIMIT 1);121 LIMIT 1);
122--enable_result_log122--enable_result_log
123123
124SET GLOBAL INNODB_CHANGED_PAGES_LIMIT = 0;124SET GLOBAL INNODB_MAX_CHANGED_PAGES = 0;
125--echo Total number of changed pages is smaller than reasonable limit (should be 1):125--echo Total number of changed pages is smaller than reasonable limit (should be 1):
126eval SELECT COUNT(DISTINCT PAGE_ID) < 10126eval SELECT COUNT(DISTINCT PAGE_ID) < 10
127 FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES127 FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES
@@ -254,12 +254,12 @@
254# Check how limit for maximum rows count works #254# Check how limit for maximum rows count works #
255################################################255################################################
256256
257SET GLOBAL INNODB_CHANGED_PAGES_LIMIT = 1;257SET GLOBAL INNODB_MAX_CHANGED_PAGES = 1;
258SELECT COUNT(*) FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES;258SELECT COUNT(*) FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES;
259259
260SET GLOBAL INNODB_CHANGED_PAGES_LIMIT = 5;260SET GLOBAL INNODB_MAX_CHANGED_PAGES = 5;
261SELECT COUNT(*) FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES;261SELECT COUNT(*) FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES;
262262
263eval SET GLOBAL INNODB_CHANGED_PAGES_LIMIT = $old_changed_pages_limit;263eval SET GLOBAL INNODB_MAX_CHANGED_PAGES = $old_max_changed_pages;
264264
265DROP TABLE T1;265DROP TABLE T1;
266266
=== modified file 'Percona-Server/storage/innodb_plugin/handler/ha_innodb.cc'
--- Percona-Server/storage/innodb_plugin/handler/ha_innodb.cc 2013-01-22 16:28:47 +0000
+++ Percona-Server/storage/innodb_plugin/handler/ha_innodb.cc 2013-01-29 15:18:22 +0000
@@ -12166,7 +12166,7 @@
12166 "The maximum size of changed page bitmap files",12166 "The maximum size of changed page bitmap files",
12167 NULL, NULL, 100*1024*1024ULL, 4096ULL, ULONGLONG_MAX, 0);12167 NULL, NULL, 100*1024*1024ULL, 4096ULL, ULONGLONG_MAX, 0);
1216812168
12169static MYSQL_SYSVAR_ULONGLONG(changed_pages_limit, srv_changed_pages_limit,12169static MYSQL_SYSVAR_ULONGLONG(max_changed_pages, srv_max_changed_pages,
12170 PLUGIN_VAR_RQCMDARG,12170 PLUGIN_VAR_RQCMDARG,
12171 "The maximum number of rows for "12171 "The maximum number of rows for "
12172 "INFORMATION_SCHEMA.INNODB_CHANGED_PAGES table, "12172 "INFORMATION_SCHEMA.INNODB_CHANGED_PAGES table, "
@@ -12431,7 +12431,7 @@
12431 MYSQL_SYSVAR(change_buffering),12431 MYSQL_SYSVAR(change_buffering),
12432 MYSQL_SYSVAR(track_changed_pages),12432 MYSQL_SYSVAR(track_changed_pages),
12433 MYSQL_SYSVAR(max_bitmap_file_size),12433 MYSQL_SYSVAR(max_bitmap_file_size),
12434 MYSQL_SYSVAR(changed_pages_limit),12434 MYSQL_SYSVAR(max_changed_pages),
12435#if defined UNIV_DEBUG || defined UNIV_IBUF_DEBUG12435#if defined UNIV_DEBUG || defined UNIV_IBUF_DEBUG
12436 MYSQL_SYSVAR(change_buffering_debug),12436 MYSQL_SYSVAR(change_buffering_debug),
12437#endif /* UNIV_DEBUG || UNIV_IBUF_DEBUG */12437#endif /* UNIV_DEBUG || UNIV_IBUF_DEBUG */
1243812438
=== modified file 'Percona-Server/storage/innodb_plugin/handler/i_s.cc'
--- Percona-Server/storage/innodb_plugin/handler/i_s.cc 2013-01-18 03:33:06 +0000
+++ Percona-Server/storage/innodb_plugin/handler/i_s.cc 2013-01-29 15:18:22 +0000
@@ -3976,8 +3976,8 @@
3976 }3976 }
39773977
3978 while(log_online_bitmap_iterator_next(&i) &&3978 while(log_online_bitmap_iterator_next(&i) &&
3979 (!srv_changed_pages_limit ||3979 (!srv_max_changed_pages ||
3980 output_rows_num < srv_changed_pages_limit) &&3980 output_rows_num < srv_max_changed_pages) &&
3981 /*3981 /*
3982 There is no need to compare both start LSN and end LSN fields3982 There is no need to compare both start LSN and end LSN fields
3983 with maximum value. It's enough to compare only start LSN.3983 with maximum value. It's enough to compare only start LSN.
39843984
=== modified file 'Percona-Server/storage/innodb_plugin/include/srv0srv.h'
--- Percona-Server/storage/innodb_plugin/include/srv0srv.h 2012-12-14 22:29:39 +0000
+++ Percona-Server/storage/innodb_plugin/include/srv0srv.h 2013-01-29 15:18:22 +0000
@@ -138,7 +138,7 @@
138extern ib_uint64_t srv_max_bitmap_file_size;138extern ib_uint64_t srv_max_bitmap_file_size;
139139
140extern140extern
141ulonglong srv_changed_pages_limit;141ulonglong srv_max_changed_pages;
142142
143extern ibool srv_auto_extend_last_data_file;143extern ibool srv_auto_extend_last_data_file;
144extern ulint srv_last_file_size_max;144extern ulint srv_last_file_size_max;
145145
=== modified file 'Percona-Server/storage/innodb_plugin/srv/srv0srv.c'
--- Percona-Server/storage/innodb_plugin/srv/srv0srv.c 2012-12-14 22:29:39 +0000
+++ Percona-Server/storage/innodb_plugin/srv/srv0srv.c 2013-01-29 15:18:22 +0000
@@ -166,7 +166,7 @@
166166
167UNIV_INTERN ib_uint64_t srv_max_bitmap_file_size = 100 * 1024 * 1024;167UNIV_INTERN ib_uint64_t srv_max_bitmap_file_size = 100 * 1024 * 1024;
168168
169UNIV_INTERN ulonglong srv_changed_pages_limit = 0;169UNIV_INTERN ulonglong srv_max_changed_pages = 0;
170170
171/** When TRUE, fake change transcations take S rather than X row locks.171/** When TRUE, fake change transcations take S rather than X row locks.
172 When FALSE, row locks are not taken at all. */172 When FALSE, row locks are not taken at all. */

Subscribers

People subscribed via source and target branches