← Back to branch summary

~gl-az/percona-xtrabackup/2.0-ST31441-suspend-debugging

« back to all changes in this revision

Viewing changes to patches/innodb56.patch

  • Committer: Alexey Kopytov
  • Date: 2013-04-17 07:47:01 UTC
  • mfrom: (528.1.1 2.0)
  • Revision ID: akopytov@gmail.com-20130417074701-nvlidooh0ou84fg5
Merged lp:~laurynas-biveinis/percona-xtrabackup/BT-28340-bug-1158154-2.0-5.6.

Show diffs side-by-side

added added

removed removed

Lines of Context:
patches/innodb56.patch
801
801
 
802
802
                trx_start_low(trx);
803
803
                /* fall through */
 
804
--- a/storage/innobase/mem/mem0dbg.cc
 
805
+++ b/storage/innobase/mem/mem0dbg.cc
 
806
@@ -278,18 +278,10 @@
 
807
        byte*   buf,    /*!< in: pointer to buffer */
 
808
        ulint    n)     /*!< in: length of buffer */
 
809
 {
 
810
-       byte*   ptr;
 
811
-
 
812
        UNIV_MEM_ASSERT_W(buf, n);
 
813
 
 
814
-       for (ptr = buf; ptr < buf + n; ptr++) {
 
815
-
 
816
-               if (ut_rnd_gen_ibool()) {
 
817
-                       *ptr = 0xBA;
 
818
-               } else {
 
819
-                       *ptr = 0xBE;
 
820
-               }
 
821
-       }
 
822
+       /* Fix https://bugs.launchpad.net/percona-xtrabackup/+bug/1158154 */
 
823
+       memset(buf, 0xBA, n);
 
824
 
 
825
        UNIV_MEM_INVALID(buf, n);
 
826
 }
 
827
@@ -304,17 +296,10 @@
 
828
        byte*   buf,    /*!< in: pointer to buffer */
 
829
        ulint   n)      /*!< in: length of buffer */
 
830
 {
 
831
-       byte*   ptr;
 
832
-
 
833
        UNIV_MEM_ASSERT_W(buf, n);
 
834
 
 
835
-       for (ptr = buf; ptr < buf + n; ptr++) {
 
836
-               if (ut_rnd_gen_ibool()) {
 
837
-                       *ptr = 0xDE;
 
838
-               } else {
 
839
-                       *ptr = 0xAD;
 
840
-               }
 
841
-       }
 
842
+       /* Fix https://bugs.launchpad.net/percona-xtrabackup/+bug/1158154 */
 
843
+       memset(buf, 0xDE, n);
 
844
 
 
845
        UNIV_MEM_FREE(buf, n);
 
846
 }