bk commit into 4.1 tree (heikki:1.2116)

[Heikki Tuuri]

Below is the list of changes that have just been committed into a local
4.1 repository of heikki. When heikki does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2116 05/03/15 08:26:17 heikki@stripped +1 -0
  buf0flu.c:
    Add diagnostics to track why ut_a(block->state == BUF_BLOCK_FILE_PAGE) failed in buf_flush_ready_for_replace() for a user

  innobase/buf/buf0flu.c
    1.26 05/03/15 08:26:02 heikki@stripped +9 -1
    Add diagnostics to track why ut_a(block->state == BUF_BLOCK_FILE_PAGE) failed in buf_flush_ready_for_replace() for a user

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	heikki
# Host:	hundin.mysql.fi
# Root:	/home/heikki/mysql-4.1

--- 1.25/innobase/buf/buf0flu.c	Wed Aug 18 20:57:47 2004
+++ 1.26/innobase/buf/buf0flu.c	Tue Mar 15 08:26:02 2005
@@ -115,7 +115,15 @@
 #ifdef UNIV_SYNC_DEBUG
 	ut_ad(mutex_own(&(buf_pool->mutex)));
 #endif /* UNIV_SYNC_DEBUG */
-	ut_a(block->state == BUF_BLOCK_FILE_PAGE);
+	if (block->state != BUF_BLOCK_FILE_PAGE) {
+		ut_print_timestamp(stderr);
+		fprintf(stderr,
+"  InnoDB: Error: buffer block state %lu in the LRU list!\n",
+			(ulong)block->state);
+		ut_print_buf(stderr, (byte*)block, sizeof(buf_block_t));
+
+		return(FALSE);
+	}
 
 	if ((ut_dulint_cmp(block->oldest_modification, ut_dulint_zero) > 0)
 	    || (block->buf_fix_count != 0)