Merge lp:~laurynas-biveinis/percona-server/bug1046389 into lp:percona-server/5.1

[Laurynas Biveinis]

Fix bug 1046389 (UNIV_DEBUG build broken).

There are two regressions, both fixed:
1) Fix for bug 905334 regressed in adding debug-specific code with
missing local variable that breaks the build.

2) Dynamic UNIV_PAGE_SIZE introduced a warning regression, presumably
with a recent compiler.

Re-recorded the percona_server_variables_debug test due to additional
variables enabled.

Jenkins run, adjusted accordingly: http://jenkins.percona.com/job/percona-server-5.1-param-UNIV_DEBUG/2/

Since original bug 905334 fix turned out to be a no-op, I retested it with Kristian's (cd mysql-test ; for i in `seq 1000`; do echo XXX $i XXX; ./mtr --parallel=2 innodb.innodb_bug56680 || exit 1 ; done).

The UNIV_PAGE_SIZE part is a null merge for 5.5.

Has to go to trunk in a separate merge with the main Jenkins configuration adjusted to add -DUNIV_DEBUG at the same time.

[Vlad Lesin (vlad-lesin)]

The code looks good.

[Laurynas Biveinis (laurynas-biveinis)]

Wrong order of the tests in the bug 905334 fix, invalidating this fix: the buffer page type check must come before the page no test, or the latter will assert.

review: Needs Fixing

=== modified file 'Percona-Server/mysql-test/r/percona_server_variables_debug.result'
--- Percona-Server/mysql-test/r/percona_server_variables_debug.result	2012-09-05 22:27:47 +0000
+++ Percona-Server/mysql-test/r/percona_server_variables_debug.result	2012-09-17 13:33:07 +0000
@@ -89,6 +89,7 @@
 INNODB_BUFFER_POOL_SIZE
 INNODB_CHANGED_PAGES_LIMIT
 INNODB_CHANGE_BUFFERING
+INNODB_CHANGE_BUFFERING_DEBUG
 INNODB_CHECKPOINT_AGE_TARGET
 INNODB_CHECKSUMS
 INNODB_COMMIT_CONCURRENCY
@@ -159,6 +160,7 @@
 INNODB_THREAD_CONCURRENCY_TIMER_BASED
 INNODB_THREAD_SLEEP_DELAY
 INNODB_TRACK_CHANGED_PAGES
+INNODB_TRX_RSEG_N_SLOTS_DEBUG
 INNODB_USE_PURGE_THREAD
 INNODB_USE_SYS_MALLOC
 INNODB_USE_SYS_STATS_TABLE

=== modified file 'Percona-Server/storage/innodb_plugin/buf/buf0buf.c'
--- Percona-Server/storage/innodb_plugin/buf/buf0buf.c	2012-08-19 15:14:44 +0000
+++ Percona-Server/storage/innodb_plugin/buf/buf0buf.c	2012-09-17 13:33:07 +0000
@@ -2123,6 +2123,7 @@
 	if (mode == BUF_GET_IF_IN_POOL && ibuf_debug) {
 		/* Try to evict the block from the buffer pool, to use the
 		insert buffer as much as possible. */
+		ulint	page_no	= buf_block_get_page_no(block);
 
 		if (buf_LRU_free_block(&block->page, TRUE, FALSE)) {
 			//buf_pool_mutex_exit();
@@ -2131,11 +2132,10 @@
 				"innodb_change_buffering_debug evict %u %u\n",
 				(unsigned) space, (unsigned) offset);
 			return(NULL);
-		} else if (UNIV_UNLIKELY(buf_block_get_page_no(block)
-					 != page_no
-				|| buf_block_get_space(block) != space
-				|| (buf_block_get_state(block)
-				    != BUF_BLOCK_FILE_PAGE))) {
+		} else if (UNIV_UNLIKELY(buf_block_get_state(block)
+					 != BUF_BLOCK_FILE_PAGE
+				|| (buf_block_get_page_no(block) != page_no)
+				|| (buf_block_get_space(block) != space))) {
 
 				/* buf_LRU_free_block temporarily releases the
 				block mutex, and now block points to something

=== modified file 'Percona-Server/storage/innodb_plugin/page/page0page.c'
--- Percona-Server/storage/innodb_plugin/page/page0page.c	2012-02-17 09:42:04 +0000
+++ Percona-Server/storage/innodb_plugin/page/page0page.c	2012-09-17 13:33:07 +0000
@@ -1584,7 +1584,7 @@
 	n--;
 
 	ut_ad(n >= 0);
-	ut_ad(n < UNIV_PAGE_SIZE / (REC_N_NEW_EXTRA_BYTES + 1));
+	ut_ad((ulint) n < UNIV_PAGE_SIZE / (REC_N_NEW_EXTRA_BYTES + 1));
 
 	return((ulint) n);
 }