diff options
| author | Jan Lindström <jplindst@mariadb.org> | 2014-08-01 12:54:56 +0300 |
|---|---|---|
| committer | Jan Lindström <jplindst@mariadb.org> | 2014-08-01 12:54:56 +0300 |
| commit | 27d23c020aeaeb155096d6939e51799a6a391028 (patch) | |
| tree | c9b3951e113e60022d12ffebff33c74cea9baafc /storage/xtradb/include | |
| parent | 37ba4f37acce26488c7822cc321d6fb9aa6f4f73 (diff) | |
| parent | a9e8b577a9c933631b399b7fb71ceabcd5540cf4 (diff) | |
| download | mariadb-git-27d23c020aeaeb155096d6939e51799a6a391028.tar.gz | |
Merged percona-server-5.5.38-35.2.
Diffstat (limited to 'storage/xtradb/include')
| -rw-r--r-- | storage/xtradb/include/buf0buf.ic | 5 | ||||
| -rw-r--r-- | storage/xtradb/include/buf0lru.h | 3 | ||||
| -rw-r--r-- | storage/xtradb/include/univ.i | 4 |
3 files changed, 8 insertions, 4 deletions
diff --git a/storage/xtradb/include/buf0buf.ic b/storage/xtradb/include/buf0buf.ic index 7fd32e4e995..1d7924843b9 100644 --- a/storage/xtradb/include/buf0buf.ic +++ b/storage/xtradb/include/buf0buf.ic @@ -689,6 +689,11 @@ buf_page_get_block( /*===============*/ buf_page_t* bpage) /*!< in: control block, or NULL */ { +#ifdef UNIV_SYNC_DEBUG + buf_pool_t* buf_pool = buf_pool_from_bpage(bpage); + ut_ad(rw_lock_own(&buf_pool->page_hash_latch, RW_LOCK_SHARED) + || rw_lock_own(&buf_pool->page_hash_latch, RW_LOCK_EX)); +#endif if (UNIV_LIKELY(bpage != NULL)) { ut_ad(buf_page_in_file(bpage)); diff --git a/storage/xtradb/include/buf0lru.h b/storage/xtradb/include/buf0lru.h index 00988f0957a..2c845e6fbc4 100644 --- a/storage/xtradb/include/buf0lru.h +++ b/storage/xtradb/include/buf0lru.h @@ -99,10 +99,9 @@ ibool buf_LRU_free_block( /*===============*/ buf_page_t* bpage, /*!< in: block to be freed */ - void* block_mutex, /*!< in: block mutex or NULL */ ibool zip, /*!< in: TRUE if should remove also the compressed page of an uncompressed page */ - ibool* have_LRU_mutex) + ibool have_LRU_mutex) __attribute__((nonnull)); /******************************************************************//** Try to free a replaceable block. diff --git a/storage/xtradb/include/univ.i b/storage/xtradb/include/univ.i index e9ea4695c87..ca5f57808bd 100644 --- a/storage/xtradb/include/univ.i +++ b/storage/xtradb/include/univ.i @@ -64,10 +64,10 @@ component, i.e. we show M.N.P as M.N */ (INNODB_VERSION_MAJOR << 8 | INNODB_VERSION_MINOR) #ifndef PERCONA_INNODB_VERSION -#define PERCONA_INNODB_VERSION 35.0 +#define PERCONA_INNODB_VERSION 35.2 #endif -#define INNODB_VERSION_STR "5.5.37-MariaDB-" IB_TO_STR(PERCONA_INNODB_VERSION) +#define INNODB_VERSION_STR "5.5.38-MariaDB-" IB_TO_STR(PERCONA_INNODB_VERSION) #define REFMAN "http://dev.mysql.com/doc/refman/" \ IB_TO_STR(MYSQL_MAJOR_VERSION) "." \ |