Skip to content

Commit 3674c36

Browse files
committed
MDEV-7918: A number of tests fail in valgrind builder with "InnoDB: Error: Requested state 6 current state 4 old_state 4"
Problem with this state transfer is that different state transfers are protected with different mutexes.
1 parent 47c344b commit 3674c36

File tree

2 files changed

+0
-14
lines changed

2 files changed

+0
-14
lines changed

storage/innobase/include/buf0buf.ic

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -275,13 +275,6 @@ buf_page_set_state(
275275
}
276276
#endif /* UNIV_DEBUG */
277277
bpage->state = state;
278-
#ifdef UNIV_DEBUG
279-
if( buf_page_get_state(bpage) != state) {
280-
fprintf(stderr, "InnoDB: Error: Requested state %d current state %d old_state %d\n",
281-
state, buf_page_get_state(bpage), old_state);
282-
}
283-
#endif
284-
ut_ad(buf_page_get_state(bpage) == state);
285278
}
286279

287280
/*********************************************************************//**

storage/xtradb/include/buf0buf.ic

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -279,13 +279,6 @@ buf_page_set_state(
279279
#endif /* UNIV_DEBUG */
280280

281281
bpage->state = state;
282-
#ifdef UNIV_DEBUG
283-
if( buf_page_get_state(bpage) != state) {
284-
fprintf(stderr, "InnoDB: Error: Requested state %d current state %d old_state %d\n",
285-
state, buf_page_get_state(bpage), old_state);
286-
}
287-
#endif
288-
ut_ad(buf_page_get_state(bpage) == state);
289282
}
290283

291284
/*********************************************************************//**

0 commit comments

Comments
 (0)