Skip to content

Commit

Permalink
MDEV-7918: A number of tests fail in valgrind builder with "InnoDB: E…
Browse files Browse the repository at this point in the history
…rror: Requested state 6 current state 4 old_state 4"

Problem with this state transfer is that different state transfers
are protected with different mutexes.
  • Loading branch information
Jan Lindström committed Apr 6, 2015
1 parent 47c344b commit 3674c36
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 14 deletions.
7 changes: 0 additions & 7 deletions storage/innobase/include/buf0buf.ic
Original file line number Diff line number Diff line change
Expand Up @@ -275,13 +275,6 @@ buf_page_set_state(
}
#endif /* UNIV_DEBUG */
bpage->state = state;
#ifdef UNIV_DEBUG
if( buf_page_get_state(bpage) != state) {
fprintf(stderr, "InnoDB: Error: Requested state %d current state %d old_state %d\n",
state, buf_page_get_state(bpage), old_state);
}
#endif
ut_ad(buf_page_get_state(bpage) == state);
}

/*********************************************************************//**
Expand Down
7 changes: 0 additions & 7 deletions storage/xtradb/include/buf0buf.ic
Original file line number Diff line number Diff line change
Expand Up @@ -279,13 +279,6 @@ buf_page_set_state(
#endif /* UNIV_DEBUG */

bpage->state = state;
#ifdef UNIV_DEBUG
if( buf_page_get_state(bpage) != state) {
fprintf(stderr, "InnoDB: Error: Requested state %d current state %d old_state %d\n",
state, buf_page_get_state(bpage), old_state);
}
#endif
ut_ad(buf_page_get_state(bpage) == state);
}

/*********************************************************************//**
Expand Down

0 comments on commit 3674c36

Please sign in to comment.