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/fsp | |
| 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/fsp')
| -rw-r--r-- | storage/xtradb/fsp/fsp0fsp.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/storage/xtradb/fsp/fsp0fsp.cc b/storage/xtradb/fsp/fsp0fsp.cc index 7811f1cf5cc..9292f84ab02 100644 --- a/storage/xtradb/fsp/fsp0fsp.cc +++ b/storage/xtradb/fsp/fsp0fsp.cc @@ -132,7 +132,7 @@ fsp_fill_free_list( ulint space, /*!< in: space */ fsp_header_t* header, /*!< in/out: space header */ mtr_t* mtr) /*!< in/out: mini-transaction */ - UNIV_COLD MY_ATTRIBUTE((nonnull)); + UNIV_COLD; /**********************************************************************//** Allocates a single free page from a segment. This function implements the intelligent allocation strategy which tries to minimize file space @@ -161,7 +161,7 @@ fseg_alloc_free_page_low( in which the page should be initialized. If init_mtr!=mtr, but the page is already latched in mtr, do not initialize the page. */ - MY_ATTRIBUTE((warn_unused_result, nonnull)); + MY_ATTRIBUTE((warn_unused_result)); #endif /* !UNIV_HOTBACKUP */ /**********************************************************************//** @@ -1329,7 +1329,7 @@ Allocates a single free page from a space. The page is marked as used. @retval block, rw_lock_x_lock_count(&block->lock) == 1 if allocation succeeded (init_mtr == mtr, or the page was not previously freed in mtr) @retval block (not allocated or initialized) otherwise */ -static MY_ATTRIBUTE((nonnull, warn_unused_result)) +static MY_ATTRIBUTE((warn_unused_result)) buf_block_t* fsp_alloc_free_page( /*================*/ |