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

[Stewart Smith]

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/

[Laurynas Biveinis (laurynas-biveinis)]

review: Approve

=== added file 'patches/bug966844_page_size_error_on_5520_upgrade.patch'
--- patches/bug966844_page_size_error_on_5520_upgrade.patch	1970-01-01 00:00:00 +0000
+++ patches/bug966844_page_size_error_on_5520_upgrade.patch	2012-03-28 12:42:21 +0000
@@ -0,0 +1,22 @@
+Bug#966844 "page size 1024 but the only supported page size in this release is=16384" error on upgrade to 5.5.2[01]
+
+Patch is from http://bugs.mysql.com/bug.php?id=64160
+http://bugs.mysql.com/file.php?id=18031&text=1
+By Kevin Lewis
+
+Adapted to Percona Server by Stewart Smith
+
+--- a/storage/innobase/srv/srv0start.c
++++ b/storage/innobase/srv/srv0start.c
+@@ -925,8 +925,9 @@
+ #endif /* UNIV_LOG_ARCHIVE */
+ 				min_flushed_lsn, max_flushed_lsn);
+ 
+-			if (UNIV_PAGE_SIZE
+-			    != fsp_flags_get_page_size(flags)) {
++			if (!one_opened
++			    && UNIV_PAGE_SIZE
++			       != fsp_flags_get_page_size(flags)) {
+ 
+ 				ut_print_timestamp(stderr);
+ 				fprintf(stderr,

=== modified file 'patches/series'
--- patches/series	2012-03-19 05:28:13 +0000
+++ patches/series	2012-03-28 12:42:21 +0000
@@ -65,3 +65,4 @@
 warning_fixes.patch
 bug917246.patch
 bug54330.patch
+bug966844_page_size_error_on_5520_upgrade.patch