1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-25466 Merge new release of InnoDB 5.7.34 to 10.2

Browse Source
This commit is contained in:
Marko Mäkelä 2021-04-20 17:33:36 +03:00
commit 922e676b43
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
storage/innobase/fil/fil0fil.cc
View File

@ -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. Copyright (c) 2014, 2020, MariaDB Corporation.
This program is free software; you can redistribute it and/or modify it under 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); row_mysql_unlock_data_dictionary(trx);
DEBUG_SYNC_C("buffer_pool_scan"); 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); buf_LRU_flush_or_remove_pages(id, NULL);
btr_search_s_unlock_all();
row_mysql_lock_data_dictionary(trx); row_mysql_lock_data_dictionary(trx);

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_MAJOR 5
#define INNODB_VERSION_MINOR 7 #define INNODB_VERSION_MINOR 7
#define INNODB_VERSION_BUGFIX 33 #define INNODB_VERSION_BUGFIX 34
/* The following is the InnoDB version as shown in /* The following is the InnoDB version as shown in
SELECT plugin_version FROM information_schema.plugins; SELECT plugin_version FROM information_schema.plugins;