Merge lp:~laurynas-biveinis/percona-xtrabackup/BT-28340-bug1158154-2.0 into lp:percona-xtrabackup/2.0

[Laurynas Biveinis]

Fix bug 1158154 (Suboptimal debug code in mem_init_buf() and
mem_erase_buf()) in all configurations by patching mem_init_buf() and
mem_erase_buf() to use memset() instead of a
ut_rnd_gen_ibool()-calling loops.

BT 28340

http://jenkins.percona.com/job/percona-xtrabackup-2.0-param/382/

[Laurynas Biveinis (laurynas-biveinis)]

Note that merging this to 2.0 will *not* be enough to set the bug to Fix Released on 2.0. innodb56.patch needs to be fixed as well, this was not done in the current MP because the 2.0 and 2.1 GCA precedes innodb56.patch introduction.

[Stewart Smith (stewart)]

review: Approve

[Stewart Smith (stewart)]

As I mentioned for 2.1 review: may be good to have valgrind annotations if we don't already.

[Laurynas Biveinis (laurynas-biveinis)]

They are there already, UNIV_MEM_ASSERT_W/UNIV_MEM_INVALID.

=== modified file 'patches/innodb51.patch'
--- patches/innodb51.patch	2013-03-13 05:02:58 +0000
+++ patches/innodb51.patch	2013-03-22 05:16:21 +0000
@@ -1262,3 +1262,46 @@
  						} else {
  							fprintf(stderr,
  								"InnoDB: Since"
+--- a/storage/innodb_plugin/mem/mem0dbg.c
++++ b/storage/innodb_plugin/mem/mem0dbg.c
+@@ -272,18 +272,10 @@
+ 	byte*	buf,	/*!< in: pointer to buffer */
+ 	ulint	 n)	/*!< in: length of buffer */
+ {
+-	byte*	ptr;
+-
+ 	UNIV_MEM_ASSERT_W(buf, n);
+ 
+-	for (ptr = buf; ptr < buf + n; ptr++) {
+-
+-		if (ut_rnd_gen_ibool()) {
+-			*ptr = 0xBA;
+-		} else {
+-			*ptr = 0xBE;
+-		}
+-	}
++	/* Fix https://bugs.launchpad.net/percona-xtrabackup/+bug/1158154 */
++	memset(buf, 0xBA, n);
+ 
+ 	UNIV_MEM_INVALID(buf, n);
+ }
+@@ -298,17 +290,10 @@
+ 	byte*	buf,	/*!< in: pointer to buffer */
+ 	ulint	n)	/*!< in: length of buffer */
+ {
+-	byte*	ptr;
+-
+ 	UNIV_MEM_ASSERT_W(buf, n);
+ 
+-	for (ptr = buf; ptr < buf + n; ptr++) {
+-		if (ut_rnd_gen_ibool()) {
+-			*ptr = 0xDE;
+-		} else {
+-			*ptr = 0xAD;
+-		}
+-	}
++	/* Fix https://bugs.launchpad.net/percona-xtrabackup/+bug/1158154 */
++	memset(buf, 0xDE, n);
+ 
+ 	UNIV_MEM_FREE(buf, n);
+ }

=== modified file 'patches/innodb51_builtin.patch'
--- patches/innodb51_builtin.patch	2013-03-13 05:02:58 +0000
+++ patches/innodb51_builtin.patch	2013-03-22 05:16:21 +0000
@@ -1029,6 +1029,47 @@
  #ifdef UNIV_MEM_DEBUG
  /**********************************************************************
  Initializes an allocated memory field in the debug version. */
+@@ -221,18 +242,10 @@
+ 	byte*	buf,	/* in: pointer to buffer */
+ 	ulint	 n)	/* in: length of buffer */
+ {
+-	byte*	ptr;
+-
+ 	UNIV_MEM_ASSERT_W(buf, n);
+ 
+-	for (ptr = buf; ptr < buf + n; ptr++) {
+-
+-		if (ut_rnd_gen_ibool()) {
+-			*ptr = 0xBA;
+-		} else {
+-			*ptr = 0xBE;
+-		}
+-	}
++	/* Fix https://bugs.launchpad.net/percona-xtrabackup/+bug/1158154 */
++	memset(buf, 0xBA, n);
+ 
+ 	UNIV_MEM_INVALID(buf, n);
+ }
+@@ -247,17 +260,10 @@
+ 	byte*	buf,	/* in: pointer to buffer */
+ 	ulint	 n)	 /* in: length of buffer */
+ {
+-	byte*	ptr;
+-
+ 	UNIV_MEM_ASSERT_W(buf, n);
+ 
+-	for (ptr = buf; ptr < buf + n; ptr++) {
+-		if (ut_rnd_gen_ibool()) {
+-			*ptr = 0xDE;
+-		} else {
+-			*ptr = 0xAD;
+-		}
+-	}
++	/* Fix https://bugs.launchpad.net/percona-xtrabackup/+bug/1158154 */
++	memset(buf, 0xDE, n);
+ 
+ 	UNIV_MEM_FREE(buf, n);
+ }
 --- a/storage/innobase/mem/mem0mem.c
 +++ b/storage/innobase/mem/mem0mem.c
 @@ -472,6 +472,7 @@

=== modified file 'patches/innodb55.patch'
--- patches/innodb55.patch	2013-03-13 05:02:58 +0000
+++ patches/innodb55.patch	2013-03-22 05:16:21 +0000
@@ -1179,3 +1179,46 @@
  	ut_a(purge_sys->trx->n_active_thrs == 0);
  
  	rw_lock_x_lock(&purge_sys->latch);
+--- a/storage/innobase/mem/mem0dbg.c
++++ b/storage/innobase/mem/mem0dbg.c
+@@ -280,18 +280,10 @@
+ 	byte*	buf,	/*!< in: pointer to buffer */
+ 	ulint	 n)	/*!< in: length of buffer */
+ {
+-	byte*	ptr;
+-
+ 	UNIV_MEM_ASSERT_W(buf, n);
+ 
+-	for (ptr = buf; ptr < buf + n; ptr++) {
+-
+-		if (ut_rnd_gen_ibool()) {
+-			*ptr = 0xBA;
+-		} else {
+-			*ptr = 0xBE;
+-		}
+-	}
++	/* Fix https://bugs.launchpad.net/percona-xtrabackup/+bug/1158154 */
++	memset(buf, 0xBA, n);
+ 
+ 	UNIV_MEM_INVALID(buf, n);
+ }
+@@ -306,17 +298,10 @@
+ 	byte*	buf,	/*!< in: pointer to buffer */
+ 	ulint	n)	/*!< in: length of buffer */
+ {
+-	byte*	ptr;
+-
+ 	UNIV_MEM_ASSERT_W(buf, n);
+ 
+-	for (ptr = buf; ptr < buf + n; ptr++) {
+-		if (ut_rnd_gen_ibool()) {
+-			*ptr = 0xDE;
+-		} else {
+-			*ptr = 0xAD;
+-		}
+-	}
++	/* Fix https://bugs.launchpad.net/percona-xtrabackup/+bug/1158154 */
++	memset(buf, 0xDE, n);
+ 
+ 	UNIV_MEM_FREE(buf, n);
+ }

=== modified file 'patches/xtradb51.patch'
--- patches/xtradb51.patch	2013-03-13 05:02:58 +0000
+++ patches/xtradb51.patch	2013-03-22 05:16:21 +0000
@@ -1345,3 +1345,46 @@
  
  			/* Write the log but do not flush it to disk */
  
+--- a/storage/innodb_plugin/mem/mem0dbg.c
++++ b/storage/innodb_plugin/mem/mem0dbg.c
+@@ -272,18 +272,10 @@
+ 	byte*	buf,	/*!< in: pointer to buffer */
+ 	ulint	 n)	/*!< in: length of buffer */
+ {
+-	byte*	ptr;
+-
+ 	UNIV_MEM_ASSERT_W(buf, n);
+ 
+-	for (ptr = buf; ptr < buf + n; ptr++) {
+-
+-		if (ut_rnd_gen_ibool()) {
+-			*ptr = 0xBA;
+-		} else {
+-			*ptr = 0xBE;
+-		}
+-	}
++	/* Fix https://bugs.launchpad.net/percona-xtrabackup/+bug/1158154 */
++	memset(buf, 0xBA, n);
+ 
+ 	UNIV_MEM_INVALID(buf, n);
+ }
+@@ -298,17 +290,10 @@
+ 	byte*	buf,	/*!< in: pointer to buffer */
+ 	ulint	n)	/*!< in: length of buffer */
+ {
+-	byte*	ptr;
+-
+ 	UNIV_MEM_ASSERT_W(buf, n);
+ 
+-	for (ptr = buf; ptr < buf + n; ptr++) {
+-		if (ut_rnd_gen_ibool()) {
+-			*ptr = 0xDE;
+-		} else {
+-			*ptr = 0xAD;
+-		}
+-	}
++	/* Fix https://bugs.launchpad.net/percona-xtrabackup/+bug/1158154 */
++	memset(buf, 0xDE, n);
+ 
+ 	UNIV_MEM_FREE(buf, n);
+ }

=== modified file 'patches/xtradb55.patch'
--- patches/xtradb55.patch	2013-03-13 05:02:58 +0000
+++ patches/xtradb55.patch	2013-03-22 05:16:21 +0000
@@ -1339,3 +1339,46 @@
    LINK_LIBRARIES(${CMAKE_THREAD_LIBS_INIT})
    
    OPTION(WITH_LIBWRAP "Compile with tcp wrappers support" OFF)
+--- a/storage/innobase/mem/mem0dbg.c
++++ b/storage/innobase/mem/mem0dbg.c
+@@ -280,18 +280,10 @@
+ 	byte*	buf,	/*!< in: pointer to buffer */
+ 	ulint	 n)	/*!< in: length of buffer */
+ {
+-	byte*	ptr;
+-
+ 	UNIV_MEM_ASSERT_W(buf, n);
+ 
+-	for (ptr = buf; ptr < buf + n; ptr++) {
+-
+-		if (ut_rnd_gen_ibool()) {
+-			*ptr = 0xBA;
+-		} else {
+-			*ptr = 0xBE;
+-		}
+-	}
++	/* Fix https://bugs.launchpad.net/percona-xtrabackup/+bug/1158154 */
++	memset(buf, 0xBA, n);
+ 
+ 	UNIV_MEM_INVALID(buf, n);
+ }
+@@ -306,17 +298,10 @@
+ 	byte*	buf,	/*!< in: pointer to buffer */
+ 	ulint	n)	/*!< in: length of buffer */
+ {
+-	byte*	ptr;
+-
+ 	UNIV_MEM_ASSERT_W(buf, n);
+ 
+-	for (ptr = buf; ptr < buf + n; ptr++) {
+-		if (ut_rnd_gen_ibool()) {
+-			*ptr = 0xDE;
+-		} else {
+-			*ptr = 0xAD;
+-		}
+-	}
++	/* Fix https://bugs.launchpad.net/percona-xtrabackup/+bug/1158154 */
++	memset(buf, 0xDE, n);
+ 
+ 	UNIV_MEM_FREE(buf, n);
+ }