From f3cf33657c5f761205c962e041f90880ede41971 Mon Sep 17 00:00:00 2001
From: marko <>
Date: Fri, 10 Nov 2006 10:09:41 +0000
Subject: [PATCH] Minor cleanup.

ha_innobase::rnd_pos(): Use correct format in DBUG_PRINT statements.

buf_page_release(): Remove the local variable buf_fix_count.
---
 handler/ha_innodb.cc | 4 ++--
 include/buf0buf.ic   | 5 +----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/handler/ha_innodb.cc b/handler/ha_innodb.cc
index ec86b9a2e68..1b86ea935be 100644
--- a/handler/ha_innodb.cc
+++ b/handler/ha_innodb.cc
@@ -4445,7 +4445,7 @@ ha_innobase::rnd_pos(
 	}
 
 	if (error) {
-		DBUG_PRINT("error", ("Got error: %ld", error));
+		DBUG_PRINT("error", ("Got error: %d", error));
 		DBUG_RETURN(error);
 	}
 
@@ -4455,7 +4455,7 @@ ha_innobase::rnd_pos(
 	error = index_read(buf, pos, ref_length, HA_READ_KEY_EXACT);
 
 	if (error) {
-		DBUG_PRINT("error", ("Got error: %ld", error));
+		DBUG_PRINT("error", ("Got error: %d", error));
 	}
 
 	change_active_index(keynr);
diff --git a/include/buf0buf.ic b/include/buf0buf.ic
index 43895295734..c448c28933a 100644
--- a/include/buf0buf.ic
+++ b/include/buf0buf.ic
@@ -625,8 +625,6 @@ buf_page_release(
 					RW_NO_LATCH */
 	mtr_t*		mtr)		/* in: mtr */
 {
-	ulint	buf_fix_count;
-
 	ut_ad(block);
 
 	ut_a(block->state == BUF_BLOCK_FILE_PAGE);
@@ -643,8 +641,7 @@ buf_page_release(
 #ifdef UNIV_SYNC_DEBUG
 	rw_lock_s_unlock(&(block->debug_latch));
 #endif
-	buf_fix_count = block->buf_fix_count;
-	block->buf_fix_count = buf_fix_count - 1;
+	block->buf_fix_count--;
 
 	mutex_exit(&block->mutex);