bk commit into 5.0 tree (heikki:1.1932)

[Heikki Tuuri]

Below is the list of changes that have just been committed into a local
5.0 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.1932 05/08/03 18:30:24 heikki@stripped +2 -0
  Merge hundin.mysql.fi:/home/heikki/mysql-4.1
  into  hundin.mysql.fi:/home/heikki/mysql-5.0

  sql/ha_innodb.cc
    1.232 05/08/03 18:30:10 heikki@stripped +0 -0
    Auto merged

  innobase/buf/buf0buf.c
    1.50 05/08/03 18:30:10 heikki@stripped +0 -0
    Auto merged

# 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-5.0/RESYNC

--- 1.49/innobase/buf/buf0buf.c	2005-06-22 12:21:08 +03:00
+++ 1.50/innobase/buf/buf0buf.c	2005-08-03 18:30:10 +03:00
@@ -1776,6 +1776,15 @@
 	buf_flush_free_margin();
 
 	frame = block->frame;
+
+	/* Reset to zero the file flush lsn field in the page; if the first
+	page of an ibdata file is 'created' in this function into the buffer
+	pool then we lose the original contents of the file flush lsn stamp.
+	Then InnoDB could in a crash recovery print a big, false, corruption
+	warning if the stamp contains an lsn bigger than the ib_logfile lsn. */
+
+	memset(frame + FIL_PAGE_FILE_FLUSH_LSN, 0, 8);
+
 #ifdef UNIV_DEBUG
 	buf_dbg_counter++;