[packages/mysql.git] / bug966844_page_size_error_on_5520_upgrade.patch

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,
Commit	Line	Data
543222d2 AM	1	Bug#966844 "page size 1024 but the only supported page size in this release is=16384" error on upgrade to 5.5.2[01]
	2
	3	Patch is from http://bugs.mysql.com/bug.php?id=64160
	4	http://bugs.mysql.com/file.php?id=18031&text=1
	5	By Kevin Lewis
	6
	7	Adapted to Percona Server by Stewart Smith
	8
	9	--- a/storage/innobase/srv/srv0start.c
	10	+++ b/storage/innobase/srv/srv0start.c
	11	@@ -925,8 +925,9 @@
	12	#endif /* UNIV_LOG_ARCHIVE */
	13	min_flushed_lsn, max_flushed_lsn);
	14
	15	- if (UNIV_PAGE_SIZE
	16	- != fsp_flags_get_page_size(flags)) {
	17	+ if (!one_opened
	18	+ && UNIV_PAGE_SIZE
	19	+ != fsp_flags_get_page_size(flags)) {
	20
	21	ut_print_timestamp(stderr);
	22	fprintf(stderr,