~percona-dev/percona-server/release-5.1.47-12

diff -ruN a/storage/innodb_plugin/buf/buf0buf.c b/storage/innodb_plugin/buf/buf0buf.c

--- a/storage/innodb_plugin/buf/buf0buf.c	2010-04-30 16:31:04.000000000 +0900

+++ b/storage/innodb_plugin/buf/buf0buf.c	2010-04-30 16:32:03.000000000 +0900

@@ -351,6 +351,27 @@

 	return(checksum);

 }

+UNIV_INTERN

+ulint

+buf_calc_page_new_checksum_32(

+/*==========================*/

+	const byte*	page)	/*!< in: buffer page */

+{

+	ulint checksum;

+

+	checksum = ut_fold_binary(page + FIL_PAGE_OFFSET,

+				  FIL_PAGE_FILE_FLUSH_LSN - FIL_PAGE_OFFSET)

+		+ ut_fold_binary(page + FIL_PAGE_DATA,

+				 FIL_PAGE_DATA_ALIGN_32 - FIL_PAGE_DATA)

+		+ ut_fold_binary_32(page + FIL_PAGE_DATA_ALIGN_32,

+				    UNIV_PAGE_SIZE - FIL_PAGE_DATA_ALIGN_32

+				    - FIL_PAGE_END_LSN_OLD_CHKSUM);

+

+	checksum = checksum & 0xFFFFFFFFUL;

+

+	return(checksum);

+}

+

 /********************************************************************//**

 In versions < 4.0.14 and < 4.1.1 there was a bug that the checksum only

 looked at the first few bytes of the page. This calculates that old

@@ -465,9 +486,21 @@

 		/* InnoDB versions < 4.0.14 and < 4.1.1 stored the space id

 		(always equal to 0), to FIL_PAGE_SPACE_OR_CHKSUM */

-		if (checksum_field != 0

+		if (!srv_fast_checksum

+		    && checksum_field != 0

+		    && checksum_field != BUF_NO_CHECKSUM_MAGIC

+		    && checksum_field

+		    != buf_calc_page_new_checksum(read_buf)) {

+

+			return(TRUE);

+		}

+

+		if (srv_fast_checksum

+		    && checksum_field != 0

 		    && checksum_field != BUF_NO_CHECKSUM_MAGIC

 		    && checksum_field

+		    != buf_calc_page_new_checksum_32(read_buf)

+		    && checksum_field

 		    != buf_calc_page_new_checksum(read_buf)) {

 			return(TRUE);

@@ -491,6 +524,7 @@

 	dict_index_t*	index;

 #endif /* !UNIV_HOTBACKUP */

 	ulint		checksum;

+	ulint		checksum_32;

 	ulint		old_checksum;

 	ulint		size	= zip_size;

@@ -577,12 +611,14 @@

 	checksum = srv_use_checksums

 		? buf_calc_page_new_checksum(read_buf) : BUF_NO_CHECKSUM_MAGIC;

+	checksum_32 = srv_use_checksums

+		? buf_calc_page_new_checksum_32(read_buf) : BUF_NO_CHECKSUM_MAGIC;

 	old_checksum = srv_use_checksums

 		? buf_calc_page_old_checksum(read_buf) : BUF_NO_CHECKSUM_MAGIC;

 	ut_print_timestamp(stderr);

 	fprintf(stderr,

-		"  InnoDB: Page checksum %lu, prior-to-4.0.14-form"

+		"  InnoDB: Page checksum %lu (32bit_calc: %lu), prior-to-4.0.14-form"

 		" checksum %lu\n"

 		"InnoDB: stored checksum %lu, prior-to-4.0.14-form"

 		" stored checksum %lu\n"

@@ -591,7 +627,7 @@

 		"InnoDB: Page number (if stored to page already) %lu,\n"

 		"InnoDB: space id (if created with >= MySQL-4.1.1"

 		" and stored already) %lu\n",

-		(ulong) checksum, (ulong) old_checksum,

+		(ulong) checksum, (ulong) checksum_32, (ulong) old_checksum,

 		(ulong) mach_read_from_4(read_buf + FIL_PAGE_SPACE_OR_CHKSUM),

 		(ulong) mach_read_from_4(read_buf + UNIV_PAGE_SIZE

 					 - FIL_PAGE_END_LSN_OLD_CHKSUM),

diff -ruN a/storage/innodb_plugin/buf/buf0flu.c b/storage/innodb_plugin/buf/buf0flu.c

--- a/storage/innodb_plugin/buf/buf0flu.c	2010-04-30 14:13:25.000000000 +0900

+++ b/storage/innodb_plugin/buf/buf0flu.c	2010-04-30 16:32:03.000000000 +0900

@@ -926,7 +926,9 @@

 	mach_write_to_4(page + FIL_PAGE_SPACE_OR_CHKSUM,

 			srv_use_checksums

-			? buf_calc_page_new_checksum(page)

+			? (!srv_fast_checksum

+			   ? buf_calc_page_new_checksum(page)

+			   : buf_calc_page_new_checksum_32(page))

 			: BUF_NO_CHECKSUM_MAGIC);

 	/* We overwrite the first 4 bytes of the end lsn field to store

diff -ruN a/storage/innodb_plugin/fil/fil0fil.c b/storage/innodb_plugin/fil/fil0fil.c

--- a/storage/innodb_plugin/fil/fil0fil.c	2010-04-30 16:31:04.000000000 +0900

+++ b/storage/innodb_plugin/fil/fil0fil.c	2010-04-30 16:32:03.000000000 +0900

@@ -3066,7 +3066,9 @@

 			mach_write_ull(page + FIL_PAGE_FILE_FLUSH_LSN, current_lsn);

 		mach_write_to_4(page + FIL_PAGE_SPACE_OR_CHKSUM,

 				srv_use_checksums

-				? buf_calc_page_new_checksum(page)

+				? (!srv_fast_checksum

+				   ? buf_calc_page_new_checksum(page)

+				   : buf_calc_page_new_checksum_32(page))

 						: BUF_NO_CHECKSUM_MAGIC);

 		mach_write_to_4(page + UNIV_PAGE_SIZE - FIL_PAGE_END_LSN_OLD_CHKSUM,

 				srv_use_checksums

@@ -3178,7 +3180,8 @@

 					goto skip_write;

 				}

-				if (checksum_field != 0

+				if (!srv_fast_checksum

+				    && checksum_field != 0

 				    && checksum_field != BUF_NO_CHECKSUM_MAGIC

 				    && checksum_field

 				    != buf_calc_page_new_checksum(page)) {

@@ -3186,6 +3189,17 @@

 					goto skip_write;

 				}

+				if (srv_fast_checksum

+				    && checksum_field != 0

+				    && checksum_field != BUF_NO_CHECKSUM_MAGIC

+				    && checksum_field

+				    != buf_calc_page_new_checksum_32(page)

+				    && checksum_field

+				    != buf_calc_page_new_checksum(page)) {

+

+					goto skip_write;

+				}

+

 				if (mach_read_from_4(page + FIL_PAGE_OFFSET) || !offset) {

 					mach_write_to_4(page + FIL_PAGE_ARCH_LOG_NO_OR_SPACE_ID, id);

@@ -3260,7 +3274,9 @@

 					mach_write_to_4(page + FIL_PAGE_SPACE_OR_CHKSUM,

 							srv_use_checksums

-							? buf_calc_page_new_checksum(page)

+							? (!srv_fast_checksum

+							   ? buf_calc_page_new_checksum(page)

+							   : buf_calc_page_new_checksum_32(page))

 									: BUF_NO_CHECKSUM_MAGIC);

 					mach_write_to_4(page + UNIV_PAGE_SIZE - FIL_PAGE_END_LSN_OLD_CHKSUM,

 							srv_use_checksums

diff -ruN a/storage/innodb_plugin/handler/ha_innodb.cc b/storage/innodb_plugin/handler/ha_innodb.cc

--- a/storage/innodb_plugin/handler/ha_innodb.cc	2010-04-30 16:31:04.000000000 +0900

+++ b/storage/innodb_plugin/handler/ha_innodb.cc	2010-04-30 16:32:03.000000000 +0900

@@ -185,6 +185,7 @@

 #endif /* UNIV_LOG_ARCHIVE */

 static my_bool	innobase_use_doublewrite		= TRUE;

 static my_bool	innobase_use_checksums			= TRUE;

+static my_bool	innobase_fast_checksum			= FALSE;

 static my_bool	innobase_extra_undoslots		= FALSE;

 static my_bool	innobase_fast_recovery			= FALSE;

 static my_bool	innobase_recovery_stats			= TRUE;

@@ -2339,6 +2340,7 @@

 	srv_use_doublewrite_buf = (ibool) innobase_use_doublewrite;

 	srv_use_checksums = (ibool) innobase_use_checksums;

+	srv_fast_checksum = (ibool) innobase_fast_checksum;

 #ifdef HAVE_LARGE_PAGES

         if ((os_use_large_pages = (ibool) my_use_large_pages))

@@ -10860,6 +10862,15 @@

   "Disable with --skip-innodb-checksums.",

   NULL, NULL, TRUE);

+static MYSQL_SYSVAR_BOOL(fast_checksum, innobase_fast_checksum,

+  PLUGIN_VAR_NOCMDARG | PLUGIN_VAR_READONLY,

+  "Change the algorithm of checksum for the whole of datapage to 4-bytes word based. "

+  "The original checksum is checked after the new one. It may be slow for reading page"

+  " which has orginal checksum. Overwrite the page or recreate the InnoDB database, "

+  "if you want the entire benefit for performance at once. "

+  "#### Attention: The checksum is not compatible for normal or disabled version! ####",

+  NULL, NULL, FALSE);

+

 static MYSQL_SYSVAR_STR(data_home_dir, innobase_data_home_dir,

   PLUGIN_VAR_READONLY,

   "The common part for InnoDB table spaces.",

@@ -11329,6 +11340,7 @@

   MYSQL_SYSVAR(autoextend_increment),

   MYSQL_SYSVAR(buffer_pool_size),

   MYSQL_SYSVAR(checksums),

+  MYSQL_SYSVAR(fast_checksum),

   MYSQL_SYSVAR(commit_concurrency),

   MYSQL_SYSVAR(concurrency_tickets),

   MYSQL_SYSVAR(data_file_path),

diff -ruN a/storage/innodb_plugin/handler/innodb_patch_info.h b/storage/innodb_plugin/handler/innodb_patch_info.h

--- a/storage/innodb_plugin/handler/innodb_patch_info.h	2010-04-30 16:31:04.000000000 +0900

+++ b/storage/innodb_plugin/handler/innodb_patch_info.h	2010-04-30 16:32:03.000000000 +0900

@@ -44,5 +44,6 @@

 {"innodb_lru_dump_restore","Dump and restore command for content of buffer pool","","http://www.percona.com/docs/wiki/percona-xtradb"},

 {"innodb_separate_doublewrite","Add option 'innodb_doublewrite_file' to separate doublewrite dedicated tablespace","","http://www.percona.com/docs/wiki/percona-xtradb"},

 {"innodb_pass_corrupt_table","Treat tables as corrupt instead of crash, when meet corrupt blocks","","http://www.percona.com/docs/wiki/percona-xtradb"},

+{"innodb_fast_checksum","Using the checksum on 32bit-unit calculation","incompatible for unpatched ver.","http://www.percona.com/docs/wiki/percona-xtradb"},

 {NULL, NULL, NULL, NULL}

 };

diff -ruN a/storage/innodb_plugin/include/buf0buf.h b/storage/innodb_plugin/include/buf0buf.h

--- a/storage/innodb_plugin/include/buf0buf.h	2010-04-30 16:31:04.000000000 +0900

+++ b/storage/innodb_plugin/include/buf0buf.h	2010-04-30 16:32:03.000000000 +0900

@@ -477,6 +477,11 @@

 buf_calc_page_new_checksum(

 /*=======================*/

 	const byte*	page);	/*!< in: buffer page */

+UNIV_INTERN

+ulint

+buf_calc_page_new_checksum_32(

+/*==========================*/

+	const byte*	page);	/*!< in: buffer page */

 /********************************************************************//**

 In versions < 4.0.14 and < 4.1.1 there was a bug that the checksum only

 looked at the first few bytes of the page. This calculates that old

diff -ruN a/storage/innodb_plugin/include/fil0fil.h b/storage/innodb_plugin/include/fil0fil.h

--- a/storage/innodb_plugin/include/fil0fil.h	2010-04-30 16:31:04.000000000 +0900

+++ b/storage/innodb_plugin/include/fil0fil.h	2010-04-30 16:32:03.000000000 +0900

@@ -117,6 +117,7 @@

 #define FIL_PAGE_ARCH_LOG_NO_OR_SPACE_ID  34 /*!< starting from 4.1.x this

 					contains the space id of the page */

 #define FIL_PAGE_DATA		38	/*!< start of the data on the page */

+#define FIL_PAGE_DATA_ALIGN_32	40

 /* @} */

 /** File page trailer @{ */

 #define FIL_PAGE_END_LSN_OLD_CHKSUM 8	/*!< the low 4 bytes of this are used

diff -ruN a/storage/innodb_plugin/include/srv0srv.h b/storage/innodb_plugin/include/srv0srv.h

--- a/storage/innodb_plugin/include/srv0srv.h	2010-04-30 16:31:04.000000000 +0900

+++ b/storage/innodb_plugin/include/srv0srv.h	2010-04-30 16:32:03.000000000 +0900

@@ -210,6 +210,7 @@

 extern ibool	srv_use_doublewrite_buf;

 extern ibool	srv_use_checksums;

+extern ibool	srv_fast_checksum;

 extern ibool	srv_set_thread_priorities;

 extern int	srv_query_thread_priority;

diff -ruN a/storage/innodb_plugin/include/ut0rnd.h b/storage/innodb_plugin/include/ut0rnd.h

--- a/storage/innodb_plugin/include/ut0rnd.h	2010-04-06 23:07:13.000000000 +0900

+++ b/storage/innodb_plugin/include/ut0rnd.h	2010-04-30 16:32:03.000000000 +0900

@@ -124,6 +124,13 @@

 	const byte*	str,	/*!< in: string of bytes */

 	ulint		len)	/*!< in: length */

 	__attribute__((pure));

+UNIV_INLINE

+ulint

+ut_fold_binary_32(

+/*==============*/

+	const byte*	str,	/*!< in: string of bytes */

+	ulint		len)	/*!< in: length */

+	__attribute__((pure));

 /***********************************************************//**

 Looks for a prime number slightly greater than the given argument.

 The prime is chosen so that it is not near any power of 2.

diff -ruN a/storage/innodb_plugin/include/ut0rnd.ic b/storage/innodb_plugin/include/ut0rnd.ic

--- a/storage/innodb_plugin/include/ut0rnd.ic	2010-04-06 23:07:13.000000000 +0900

+++ b/storage/innodb_plugin/include/ut0rnd.ic	2010-04-30 16:32:03.000000000 +0900

@@ -229,3 +229,28 @@

 	return(fold);

 }

+

+UNIV_INLINE

+ulint

+ut_fold_binary_32(

+/*==============*/

+	const byte*	str,	/*!< in: string of bytes */

+	ulint		len)	/*!< in: length */

+{

+	const ib_uint32_t*	str_end = (const ib_uint32_t*) (str + len);

+	const ib_uint32_t*	str_32 = (const ib_uint32_t*) str;

+	ulint			fold = 0;

+

+	ut_ad(str);

+	/* This function is only for word-aligned data */

+	ut_ad(len % 4 == 0);

+	ut_ad((ulint)str % 4 == 0);

+

+	while (str_32 < str_end) {

+		fold = ut_fold_ulint_pair(fold, (ulint)(*str_32));

+

+		str_32++;

+	}

+

+	return(fold);

+}

diff -ruN a/storage/innodb_plugin/srv/srv0srv.c b/storage/innodb_plugin/srv/srv0srv.c

--- a/storage/innodb_plugin/srv/srv0srv.c	2010-04-30 16:31:04.000000000 +0900

+++ b/storage/innodb_plugin/srv/srv0srv.c	2010-04-30 16:32:03.000000000 +0900

@@ -379,6 +379,7 @@

 UNIV_INTERN ibool	srv_use_doublewrite_buf	= TRUE;

 UNIV_INTERN ibool	srv_use_checksums = TRUE;

+UNIV_INTERN ibool	srv_fast_checksum = FALSE;

 UNIV_INTERN ibool	srv_set_thread_priorities = TRUE;

 UNIV_INTERN int	srv_query_thread_priority = 0;