← Back to branch summary

~percona-core/percona-xtrabackup/2.0

« back to all changes in this revision

Viewing changes to patches/innodb51.patch

  • Committer: jenkins at percona
  • Date: 2013-04-03 07:04:05 UTC
  • mfrom: (516.3.1 2.0)
  • Revision ID: jenkins@jenkins.percona.com-20130403070405-glyyxzddq2i3gkmz
Merge lp:~laurynas-biveinis/percona-xtrabackup/BT-28340-bug1158154-2.0
http://jenkins.percona.com/job/merge-XB-2.0-kickoff/17/

Show diffs side-by-side

added added

removed removed

Lines of Context:
patches/innodb51.patch
1262
1262
                                                } else {
1263
1263
                                                        fprintf(stderr,
1264
1264
                                                                "InnoDB: Since"
 
1265
--- a/storage/innodb_plugin/mem/mem0dbg.c
 
1266
+++ b/storage/innodb_plugin/mem/mem0dbg.c
 
1267
@@ -272,18 +272,10 @@
 
1268
        byte*   buf,    /*!< in: pointer to buffer */
 
1269
        ulint    n)     /*!< in: length of buffer */
 
1270
 {
 
1271
-       byte*   ptr;
 
1272
-
 
1273
        UNIV_MEM_ASSERT_W(buf, n);
 
1274
 
 
1275
-       for (ptr = buf; ptr < buf + n; ptr++) {
 
1276
-
 
1277
-               if (ut_rnd_gen_ibool()) {
 
1278
-                       *ptr = 0xBA;
 
1279
-               } else {
 
1280
-                       *ptr = 0xBE;
 
1281
-               }
 
1282
-       }
 
1283
+       /* Fix https://bugs.launchpad.net/percona-xtrabackup/+bug/1158154 */
 
1284
+       memset(buf, 0xBA, n);
 
1285
 
 
1286
        UNIV_MEM_INVALID(buf, n);
 
1287
 }
 
1288
@@ -298,17 +290,10 @@
 
1289
        byte*   buf,    /*!< in: pointer to buffer */
 
1290
        ulint   n)      /*!< in: length of buffer */
 
1291
 {
 
1292
-       byte*   ptr;
 
1293
-
 
1294
        UNIV_MEM_ASSERT_W(buf, n);
 
1295
 
 
1296
-       for (ptr = buf; ptr < buf + n; ptr++) {
 
1297
-               if (ut_rnd_gen_ibool()) {
 
1298
-                       *ptr = 0xDE;
 
1299
-               } else {
 
1300
-                       *ptr = 0xAD;
 
1301
-               }
 
1302
-       }
 
1303
+       /* Fix https://bugs.launchpad.net/percona-xtrabackup/+bug/1158154 */
 
1304
+       memset(buf, 0xDE, n);
 
1305
 
 
1306
        UNIV_MEM_FREE(buf, n);
 
1307
 }