diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-03-05 00:59:57 +0200 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-03-05 00:59:57 +0200 |
| commit | 83da1a1e572d67588b66724b34fdb7f07963e80f (patch) | |
| tree | 54af19c1da875cdaa71c3c94a42fd6dfc53e97ad /storage/xtradb/include/buf0buf.h | |
| parent | f4806772d3578fee7fd03dd96f91d59b0269830e (diff) | |
| parent | 8d69ce7b821a88b5ba8749a08489839050283a63 (diff) | |
| download | mariadb-git-83da1a1e572d67588b66724b34fdb7f07963e80f.tar.gz | |
Merge branch 'merge-xtradb-5.6' into 10.0
Diffstat (limited to 'storage/xtradb/include/buf0buf.h')
| -rw-r--r-- | storage/xtradb/include/buf0buf.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/storage/xtradb/include/buf0buf.h b/storage/xtradb/include/buf0buf.h index be08f88b33d..18c1cb4ff9d 100644 --- a/storage/xtradb/include/buf0buf.h +++ b/storage/xtradb/include/buf0buf.h @@ -243,8 +243,7 @@ buf_relocate( buf_page_t* bpage, /*!< in/out: control block being relocated; buf_page_get_state(bpage) must be BUF_BLOCK_ZIP_DIRTY or BUF_BLOCK_ZIP_PAGE */ - buf_page_t* dpage) /*!< in/out: destination control block */ - MY_ATTRIBUTE((nonnull)); + buf_page_t* dpage); /*!< in/out: destination control block */ /*********************************************************************//** Gets the current size of buffer buf_pool in bytes. @return size in bytes */ @@ -738,7 +737,7 @@ buf_page_print( ulint flags) /*!< in: 0 or BUF_PAGE_PRINT_NO_CRASH or BUF_PAGE_PRINT_NO_FULL */ - UNIV_COLD MY_ATTRIBUTE((nonnull)); + UNIV_COLD; /********************************************************************//** Decompress a block. @return TRUE if successful */ |