mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-14 19:07:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

MDEV-26205 Merge new release of InnoDB 5.7.35 to 10.2

Browse source
This commit is contained in:
Marko Mäkelä 2021-07-22 18:07:37 +03:00
commit 742b3a0d39
4 changed files with 20 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

6
storage/innobase/include/buf0buf.h
View file

@ -1,7 +1,7 @@
/*****************************************************************************
Copyright (c) 1995, 2016, Oracle and/or its affiliates. All Rights Reserved.
Copyright (c) 2013, 2020, MariaDB Corporation.
Copyright (c) 1995, 2021, Oracle and/or its affiliates.
Copyright (c) 2013, 2021, MariaDB Corporation.
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
@ -2037,8 +2037,6 @@ struct buf_pool_t{
page_hash mutex. Lookups can happen
while holding the buf_pool->mutex or
the relevant page_hash mutex. */
hash_table_t* page_hash_old; /*!< old pointer to page_hash to be
freed after resizing buffer pool */
hash_table_t* zip_hash; /*!< hash table of buf_block_t blocks
whose frames are allocated to the
zip buddy system,

2
storage/innobase/include/univ.i
View file

@ -41,7 +41,7 @@ Created 1/20/1994 Heikki Tuuri
#define INNODB_VERSION_MAJOR 5
#define INNODB_VERSION_MINOR 7
#define INNODB_VERSION_BUGFIX 34
#define INNODB_VERSION_BUGFIX 35
/* The following is the InnoDB version as shown in
SELECT plugin_version FROM information_schema.plugins;