mirror of
https://github.com/MariaDB/server.git
synced 2026-05-07 07:35:32 +02:00
Merge branch '10.0' into 10.1
This commit is contained in:
commit
3361aee591
654 changed files with 30623 additions and 12481 deletions
|
|
@ -1,6 +1,6 @@
|
|||
/*****************************************************************************
|
||||
|
||||
Copyright (c) 1995, 2013, Oracle and/or its affiliates. All Rights Reserved.
|
||||
Copyright (c) 1995, 2016, Oracle and/or its affiliates. All Rights Reserved.
|
||||
|
||||
This program is free software; you can redistribute it and/or modify it under
|
||||
the terms of the GNU General Public License as published by the Free Software
|
||||
|
|
@ -93,7 +93,7 @@ buf_LRU_free_page(
|
|||
buf_page_t* bpage, /*!< in: block to be freed */
|
||||
bool zip) /*!< in: true if should remove also the
|
||||
compressed page of an uncompressed page */
|
||||
__attribute__((nonnull));
|
||||
MY_ATTRIBUTE((nonnull));
|
||||
/******************************************************************//**
|
||||
Try to free a replaceable block.
|
||||
@return TRUE if found and freed */
|
||||
|
|
@ -105,7 +105,7 @@ buf_LRU_scan_and_free_block(
|
|||
ibool scan_all) /*!< in: scan whole LRU list
|
||||
if TRUE, otherwise scan only
|
||||
'old' blocks. */
|
||||
__attribute__((nonnull,warn_unused_result));
|
||||
MY_ATTRIBUTE((nonnull,warn_unused_result));
|
||||
/******************************************************************//**
|
||||
Returns a free block from the buf_pool. The block is taken off the
|
||||
free list. If it is empty, returns NULL.
|
||||
|
|
@ -144,7 +144,7 @@ buf_block_t*
|
|||
buf_LRU_get_free_block(
|
||||
/*===================*/
|
||||
buf_pool_t* buf_pool) /*!< in/out: buffer pool instance */
|
||||
__attribute__((nonnull,warn_unused_result));
|
||||
MY_ATTRIBUTE((nonnull,warn_unused_result));
|
||||
/******************************************************************//**
|
||||
Determines if the unzip_LRU list should be used for evicting a victim
|
||||
instead of the general LRU list.
|
||||
|
|
@ -227,7 +227,7 @@ buf_LRU_free_one_page(
|
|||
buf_page_t* bpage) /*!< in/out: block, must contain a file page and
|
||||
be in a state where it can be freed; there
|
||||
may or may not be a hash index to the page */
|
||||
__attribute__((nonnull));
|
||||
MY_ATTRIBUTE((nonnull));
|
||||
|
||||
/******************************************************************//**
|
||||
Adjust LRU hazard pointers if needed. */
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue