diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-04-20 17:33:36 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-04-20 17:33:36 +0300 |
| commit | 922e676b43c7b5cb0f20ca67c6d2222e2fc5ec03 (patch) | |
| tree | ebf4dcdb4159c8cd0505a7ad333dd6a785db1f4e | |
| parent | 635b5ce355473167af64e116e403a51bfaed184b (diff) | |
| parent | 72432ec7b3e6c4d87d86fcd00acdff1c03f402d2 (diff) | |
| download | mariadb-git-922e676b43c7b5cb0f20ca67c6d2222e2fc5ec03.tar.gz | |
MDEV-25466 Merge new release of InnoDB 5.7.34 to 10.2
| -rw-r--r-- | storage/innobase/fil/fil0fil.cc | 6 | ||||
| -rw-r--r-- | storage/innobase/include/univ.i | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/storage/innobase/fil/fil0fil.cc b/storage/innobase/fil/fil0fil.cc index 659cfa26033..39e7507373f 100644 --- a/storage/innobase/fil/fil0fil.cc +++ b/storage/innobase/fil/fil0fil.cc @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 1995, 2017, Oracle and/or its affiliates. All Rights Reserved. +Copyright (c) 1995, 2021, Oracle and/or its affiliates. All Rights Reserved. Copyright (c) 2014, 2020, MariaDB Corporation. This program is free software; you can redistribute it and/or modify it under @@ -3137,11 +3137,7 @@ fil_reinit_space_header_for_table( row_mysql_unlock_data_dictionary(trx); DEBUG_SYNC_C("buffer_pool_scan"); - /* Lock the search latch in shared mode to prevent user - from disabling AHI during the scan */ - btr_search_s_lock_all(); buf_LRU_flush_or_remove_pages(id, NULL); - btr_search_s_unlock_all(); row_mysql_lock_data_dictionary(trx); diff --git a/storage/innobase/include/univ.i b/storage/innobase/include/univ.i index fcdc8a5ae9f..0a7f745d45e 100644 --- a/storage/innobase/include/univ.i +++ b/storage/innobase/include/univ.i @@ -41,7 +41,7 @@ Created 1/20/1994 Heikki Tuuri #define INNODB_VERSION_MAJOR 5 #define INNODB_VERSION_MINOR 7 -#define INNODB_VERSION_BUGFIX 33 +#define INNODB_VERSION_BUGFIX 34 /* The following is the InnoDB version as shown in SELECT plugin_version FROM information_schema.plugins; |