diff options
| author | Sergei Petrunia <psergey@askmonty.org> | 2015-04-06 18:56:39 +0300 |
|---|---|---|
| committer | Sergei Petrunia <psergey@askmonty.org> | 2015-04-06 18:56:39 +0300 |
| commit | 2f6d63f063d1c5dd0bec01b489df51f72213c2bc (patch) | |
| tree | 64a75ad0964e2b1fa595b43a1b43506a907fbf5d | |
| parent | 2936fb127d551a1abd6f30bdfd50a8a9bcf4e41b (diff) | |
| parent | 3674c363a7e77e534c3e0d28659dc614c53fbcbc (diff) | |
| download | mariadb-git-2f6d63f063d1c5dd0bec01b489df51f72213c2bc.tar.gz | |
Merge branch '10.1' of github.com:MariaDB/server into 10.1
| -rw-r--r-- | storage/innobase/include/buf0buf.ic | 7 | ||||
| -rw-r--r-- | storage/xtradb/include/buf0buf.ic | 7 |
2 files changed, 0 insertions, 14 deletions
diff --git a/storage/innobase/include/buf0buf.ic b/storage/innobase/include/buf0buf.ic index 842aa6758cd..aed03307601 100644 --- a/storage/innobase/include/buf0buf.ic +++ b/storage/innobase/include/buf0buf.ic @@ -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); } /*********************************************************************//** diff --git a/storage/xtradb/include/buf0buf.ic b/storage/xtradb/include/buf0buf.ic index b4cbba29f3c..b522751833f 100644 --- a/storage/xtradb/include/buf0buf.ic +++ b/storage/xtradb/include/buf0buf.ic @@ -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); } /*********************************************************************//** |