← Back to branch summary

~longbow/percona-xtrabackup/bug664986

« back to all changes in this revision

Viewing changes to patches/innodb51_builtin.patch

  • Committer: Alexey Kopytov
  • Date: 2011-10-07 04:14:45 UTC
  • Revision ID: akopytov@gmail.com-20111007041445-4tycb0nw049a4pgj
Fixed a fix for a compiler warning so that a patch is consistent with 1.6.

Show diffs side-by-side

added added

removed removed

Lines of Context:
patches/innodb51_builtin.patch
553
553
        }
554
554
 
555
555
        if (node->n_pending == 0 && space->purpose == FIL_TABLESPACE
556
 
@@ -3937,6 +4130,7 @@
 
556
@@ -3937,6 +4130,8 @@
557
557
        }
558
558
 
559
559
        node->n_pending++;
560
 
+       return 0;
 
560
+
 
561
+       return(0);
561
562
 }
562
563
 
563
564
 /************************************************************************
564
 
@@ -4067,7 +4261,9 @@
 
565
@@ -4067,7 +4262,9 @@
565
566
        ut_ad(recv_no_ibuf_operations || (type == OS_FILE_WRITE)
566
567
              || !ibuf_bitmap_page(block_offset) || sync || is_log);
567
568
 #ifdef UNIV_SYNC_DEBUG
572
573
              || ibuf_page(space_id, block_offset));
573
574
 #endif
574
575
 #endif
575
 
@@ -4112,6 +4308,16 @@
 
576
@@ -4112,6 +4309,16 @@
576
577
 
577
578
        ut_ad((mode != OS_AIO_IBUF) || (space->purpose == FIL_TABLESPACE));
578
579