Merge lp:~gaul/percona-data-recovery-tool-for-innodb/do-not-write-lsn into lp:percona-data-recovery-tool-for-innodb

[Andrew Gaul]

[lp:~gaul/percona-data-recovery-tool-for-innodb/do-not-write-lsn]

51. By Aleksandr Kuzminsky on 2012-08-02

Address noisy compiler warnings

52. By Aleksandr Kuzminsky on 2012-08-03

Fixed Bug #929407

53. By Aleksandr Kuzminsky on 2012-08-03

Fixed Bug #1007450

54. By Andrew Gaul <email address hidden> on 2012-08-06

Do not modify LSN while updating old checksum

[Aleksandr Kuzminsky (akuzminsky)]

review: Approve

=== modified file 'innochecksum.c'
--- innochecksum.c	2010-09-21 07:54:13 +0000
+++ innochecksum.c	2012-08-06 21:03:18 +0000
@@ -213,7 +213,7 @@
     oldcsumfield= mach_read_from_4(p + UNIV_PAGE_SIZE - FIL_PAGE_END_LSN_OLD_CHKSUM);
     if (debug)
       printf("page %lu: old style: calculated = %lu; recorded = %lu\n", ct, oldcsum, oldcsumfield);
-    if (oldcsumfield != mach_read_from_4(p + FIL_PAGE_LSN) && oldcsumfield != oldcsum)
+    if (oldcsumfield != oldcsum)
     {
       fprintf(stderr, "page %lu invalid (fails old style checksum)\n", ct);
       fprintf(stderr, "page %lu: old style: calculated = 0x%X; recorded = 0x%X\n", ct, oldcsum, oldcsumfield);
@@ -221,7 +221,6 @@
       	fprintf(stderr, "fixing old checksum of page %lu\n", ct);
 	// rewite recorded checksum with calculated one
 	fixed_chksum = mach_read_from_4((uchar*)&oldcsum);
-	memcpy(p + FIL_PAGE_LSN, &fixed_chksum, sizeof(fixed_chksum));
 	memcpy(p + UNIV_PAGE_SIZE - FIL_PAGE_END_LSN_OLD_CHKSUM, &fixed_chksum, sizeof(fixed_chksum));
 	// move to the beginning of the page
 	if(0 != fsetpos(f, &pos)){