Many files:

  ALTER TABLE ... DISCARD/IMPORT TABLESPACE
  Track crash in buf_LRU_block_remove_hashed_page + 1807 reported in MySQL-3.23.5x


sql/ha_innodb.cc:
  ALTER TABLE ... DISCARD/IMPORT TABLESPACE
sql/sql_class.cc:
  ALTER TABLE ... DISCARD/IMPORT TABLESPACE
sql/sql_parse.cc:
  ALTER TABLE ... DISCARD/IMPORT TABLESPACE
sql/sql_table.cc:
  ALTER TABLE ... DISCARD/IMPORT TABLESPACE
sql/ha_innodb.h:
  ALTER TABLE ... DISCARD/IMPORT TABLESPACE
sql/handler.h:
  ALTER TABLE ... DISCARD/IMPORT TABLESPACE
sql/lex.h:
  ALTER TABLE ... DISCARD/IMPORT TABLESPACE
sql/mysql_priv.h:
  ALTER TABLE ... DISCARD/IMPORT TABLESPACE
sql/sql_class.h:
  ALTER TABLE ... DISCARD/IMPORT TABLESPACE
sql/sql_lex.h:
  ALTER TABLE ... DISCARD/IMPORT TABLESPACE
sql/sql_yacc.yy:
  ALTER TABLE ... DISCARD/IMPORT TABLESPACE
innobase/ha/ha0ha.c:
  Track crash in buf_LRU_block_remove_hashed_page + 1807 reported in MySQL-3.23.5x
innobase/ha/hash0hash.c:
  Track crash in buf_LRU_block_remove_hashed_page + 1807 reported in MySQL-3.23.5x
innobase/buf/buf0buf.c:
  Track crash in buf_LRU_block_remove_hashed_page + 1807 reported in MySQL-3.23.5x
innobase/buf/buf0flu.c:
  Track crash in buf_LRU_block_remove_hashed_page + 1807 reported in MySQL-3.23.5x
innobase/buf/buf0lru.c:
  Track crash in buf_LRU_block_remove_hashed_page + 1807 reported in MySQL-3.23.5x
innobase/buf/buf0rea.c:
  Track crash in buf_LRU_block_remove_hashed_page + 1807 reported in MySQL-3.23.5x
innobase/btr/btr0btr.c:
  Track crash in buf_LRU_block_remove_hashed_page + 1807 reported in MySQL-3.23.5x
innobase/btr/btr0sea.c:
  Track crash in buf_LRU_block_remove_hashed_page + 1807 reported in MySQL-3.23.5x
innobase/fil/fil0fil.c:
  ALTER TABLE ... DISCARD/IMPORT TABLESPACE
innobase/include/buf0buf.h:
  ALTER TABLE ... DISCARD/IMPORT TABLESPACE
innobase/include/ha0ha.h:
  ALTER TABLE ... DISCARD/IMPORT TABLESPACE
innobase/include/hash0hash.h:
  ALTER TABLE ... DISCARD/IMPORT TABLESPACE
innobase/include/row0mysql.h:
  ALTER TABLE ... DISCARD/IMPORT TABLESPACE
innobase/include/buf0buf.ic:
  ALTER TABLE ... DISCARD/IMPORT TABLESPACE
innobase/include/ha0ha.ic:
  ALTER TABLE ... DISCARD/IMPORT TABLESPACE
innobase/include/ibuf0ibuf.ic:
  ALTER TABLE ... DISCARD/IMPORT TABLESPACE
innobase/page/page0page.c:
  ALTER TABLE ... DISCARD/IMPORT TABLESPACE
innobase/row/row0mysql.c:
  ALTER TABLE ... DISCARD/IMPORT TABLESPACE
innobase/row/row0purge.c:
  ALTER TABLE ... DISCARD/IMPORT TABLESPACE
innobase/row/row0uins.c:
  ALTER TABLE ... DISCARD/IMPORT TABLESPACE
innobase/row/row0umod.c:
  ALTER TABLE ... DISCARD/IMPORT TABLESPACE

1 files changed, 28 insertions, 4 deletions

diff --git a/innobase/buf/buf0buf.c b/innobase/buf/buf0buf.c
index 1e1c6b25c1d..b403cc4df0d 100644
--- a/innobase/buf/buf0buf.c
+++ b/innobase/buf/buf0buf.c
@@ -468,6 +468,11 @@ buf_block_init(
 
 	block->check_index_page_at_flush = FALSE;
 
+	block->in_free_list = FALSE;
+	block->in_LRU_list = FALSE;
+
+	block->n_pointers = 0;
+
 	rw_lock_create(&(block->lock));
 	ut_ad(rw_lock_validate(&(block->lock)));
 	
@@ -687,6 +692,7 @@ buf_pool_init(
 		}
 
 		UT_LIST_ADD_LAST(free, buf_pool->free, block);
+		block->in_free_list = TRUE;
 	}
 
 	mutex_exit(&(buf_pool->mutex));
@@ -830,7 +836,7 @@ buf_page_make_young(
 
 	block = buf_block_align(frame);
 
-	ut_ad(block->state == BUF_BLOCK_FILE_PAGE);
+	ut_a(block->state == BUF_BLOCK_FILE_PAGE);
 
 	buf_LRU_make_block_young(block);
 
@@ -845,7 +851,7 @@ buf_block_free(
 /*===========*/
 	buf_block_t*	block)	/* in, own: block to be freed */
 {
-	ut_ad(block->state != BUF_BLOCK_FILE_PAGE);
+	ut_a(block->state != BUF_BLOCK_FILE_PAGE);
 
 	mutex_enter(&(buf_pool->mutex));
 
@@ -1109,6 +1115,8 @@ loop:
 		goto loop;
 	}
 
+	ut_a(block->state == BUF_BLOCK_FILE_PAGE);
+
 	must_read = FALSE;
 	
 	if (block->io_fix == BUF_IO_READ) {
@@ -1407,6 +1415,8 @@ buf_page_get_known_nowait(
 		return(FALSE);
 	}
 
+	ut_a(block->state == BUF_BLOCK_FILE_PAGE);
+
 #ifdef UNIV_SYNC_DEBUG
 	buf_block_buf_fix_inc_debug(block, file, line);
 #else
@@ -1517,7 +1527,7 @@ buf_page_init(
 	buf_block_t*	block)	/* in: block to init */
 {
 	ut_ad(mutex_own(&(buf_pool->mutex)));
-	ut_ad(block->state == BUF_BLOCK_READY_FOR_USE);
+	ut_a(block->state != BUF_BLOCK_FILE_PAGE);
 
 	/* Set the state of the block */
 	block->magic_n		= BUF_BLOCK_MAGIC_N;
@@ -1533,6 +1543,18 @@ buf_page_init(
 	
 	/* Insert into the hash table of file pages */
 
+        if (buf_page_hash_get(space, offset)) {
+                fprintf(stderr,
+"InnoDB: Error: page %lu %lu already found from the hash table\n", space,
+							offset);
+                buf_print();
+                buf_LRU_print();
+                buf_validate();
+                buf_LRU_validate();
+
+                ut_a(0);
+        }
+
 	HASH_INSERT(buf_block_t, hash, buf_pool->page_hash,
 				buf_page_address_fold(space, offset), block);
 
@@ -1605,7 +1627,7 @@ buf_page_init_for_read(
 	
 	block = buf_block_alloc();
 
-	ut_ad(block);
+	ut_a(block);
 
 	mutex_enter(&(buf_pool->mutex));
 
@@ -1769,6 +1791,8 @@ buf_page_io_complete(
 	
 	ut_ad(block);
 
+	ut_a(block->state == BUF_BLOCK_FILE_PAGE);
+
 	io_type = block->io_fix;
 
 	if (io_type == BUF_IO_READ) {