Merge lp:~stewart/percona-server/bug966844 into lp:percona-server/5.5

Proposed by Stewart Smith on 2012-03-28
Status: Merged
Approved by: Laurynas Biveinis on 2012-03-28
Approved revision: 230
Merged at revision: 231
Proposed branch: lp:~stewart/percona-server/bug966844
Merge into: lp:percona-server/5.5
Diff against target: 35 lines (+23/-0)
2 files modified
patches/bug966844_page_size_error_on_5520_upgrade.patch (+22/-0)
patches/series (+1/-0)
To merge this branch: bzr merge lp:~stewart/percona-server/bug966844
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) 2012-03-28 Approve on 2012-03-28
Review via email: mp+99712@code.launchpad.net

Description of the change

Upgrading to 5.5.20 or .21 from previous releases with 2 files in system tablespace could lead to error. This is the MySQL fix applied to PS. It likely won't be needed in .22

http://jenkins.percona.com/view/Percona%20Server%205.5/job/percona-server-5.5-param/310/

To post a comment you must log in.
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'patches/bug966844_page_size_error_on_5520_upgrade.patch'
2--- patches/bug966844_page_size_error_on_5520_upgrade.patch 1970-01-01 00:00:00 +0000
3+++ patches/bug966844_page_size_error_on_5520_upgrade.patch 2012-03-28 12:42:21 +0000
4@@ -0,0 +1,22 @@
5+Bug#966844 "page size 1024 but the only supported page size in this release is=16384" error on upgrade to 5.5.2[01]
6+
7+Patch is from http://bugs.mysql.com/bug.php?id=64160
8+http://bugs.mysql.com/file.php?id=18031&text=1
9+By Kevin Lewis
10+
11+Adapted to Percona Server by Stewart Smith
12+
13+--- a/storage/innobase/srv/srv0start.c
14++++ b/storage/innobase/srv/srv0start.c
15+@@ -925,8 +925,9 @@
16+ #endif /* UNIV_LOG_ARCHIVE */
17+ min_flushed_lsn, max_flushed_lsn);
18+
19+- if (UNIV_PAGE_SIZE
20+- != fsp_flags_get_page_size(flags)) {
21++ if (!one_opened
22++ && UNIV_PAGE_SIZE
23++ != fsp_flags_get_page_size(flags)) {
24+
25+ ut_print_timestamp(stderr);
26+ fprintf(stderr,
27
28=== modified file 'patches/series'
29--- patches/series 2012-03-19 05:28:13 +0000
30+++ patches/series 2012-03-28 12:42:21 +0000
31@@ -65,3 +65,4 @@
32 warning_fixes.patch
33 bug917246.patch
34 bug54330.patch
35+bug966844_page_size_error_on_5520_upgrade.patch

Subscribers

People subscribed via source and target branches