mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 12:02:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'refs/remotes/github/10.1' into 10.1

Browse source
This commit is contained in:
Sergei Golubchik 2016-06-28 22:13:59 +02:00
commit 8354c0c4d6
2 changed files with 28 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
storage/innobase/include/buf0buf.ic
View file

@ -302,6 +302,20 @@ buf_page_set_state(
ut_a(state == BUF_BLOCK_NOT_USED);
break;
case BUF_BLOCK_FILE_PAGE:
if (!(state == BUF_BLOCK_NOT_USED
|| state == BUF_BLOCK_REMOVE_HASH)) {
const char *old_state_name = buf_get_state_name((buf_block_t*)bpage);
bpage->state = state;
fprintf(stderr,
"InnoDB: Error: block old state %d (%s) "
" new state %d (%s) not correct\n",
old_state,
old_state_name,
state,
buf_get_state_name((buf_block_t*)bpage));
}
ut_a(state == BUF_BLOCK_NOT_USED
|| state == BUF_BLOCK_REMOVE_HASH);
break;

14
storage/xtradb/include/buf0buf.ic
View file

@ -305,6 +305,20 @@ buf_page_set_state(
ut_a(state == BUF_BLOCK_NOT_USED);
break;
case BUF_BLOCK_FILE_PAGE:
if (!(state == BUF_BLOCK_NOT_USED
|| state == BUF_BLOCK_REMOVE_HASH)) {
const char *old_state_name = buf_get_state_name((buf_block_t*)bpage);
bpage->state = state;
fprintf(stderr,
"InnoDB: Error: block old state %d (%s) "
" new state %d (%s) not correct\n",
old_state,
old_state_name,
state,
buf_get_state_name((buf_block_t*)bpage));
}
ut_a(state == BUF_BLOCK_NOT_USED
|| state == BUF_BLOCK_REMOVE_HASH);
break;