diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-06-16 11:05:09 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-06-16 12:37:00 +0300 |
| commit | e5980bf1b12f6dc4fa4ab44feb1b6a734dcc84d3 (patch) | |
| tree | 29ed5983577b468a5af5a9e155df56728d0a2cb9 /sql/sql_cache.cc | |
| parent | 6b71b3e3484818b667790b0f7426c37138fbbe53 (diff) | |
| download | mariadb-git-e5980bf1b12f6dc4fa4ab44feb1b6a734dcc84d3.tar.gz | |
Remove the unnecessary method handlerton::release_temporary_latches()
The sole purpose of handlerton::release_temporary_latches and its wrapper
function was to release the InnoDB adaptive hash index latch
(btr_search_latch).
When the btr_search_latch was split into an array of latches
in MySQL 5.7.8 as part of the Oracle Bug#20985298 fix, the "caching"
of the latch across storage engine API calls was removed. As part of that,
the function trx_search_latch_release_if_reserved() was changed to an
assertion and the function trx_reserve_search_latch_if_not_reserved()
was removed, and handlerton::release_temporary_latches() practically
became a no-op.
Note: MDEV-12121 replaced the function
trx_search_latch_release_if_reserved()
with the more appropriately named macro trx_assert_no_search_latch().
Diffstat (limited to 'sql/sql_cache.cc')
| -rw-r--r-- | sql/sql_cache.cc | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/sql/sql_cache.cc b/sql/sql_cache.cc index 0bf83915ba8..18a75dd9024 100644 --- a/sql/sql_cache.cc +++ b/sql/sql_cache.cc @@ -1,5 +1,5 @@ /* Copyright (c) 2000, 2013, Oracle and/or its affiliates. - Copyright (c) 2010, 2013, Monty Program Ab + Copyright (c) 2010, 2017, 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 @@ -1466,12 +1466,6 @@ def_week_frmt: %lu, in_trans: %d, autocommit: %d", (int)flags.autocommit)); /* - Make InnoDB to release the adaptive hash index latch before - acquiring the query cache mutex. - */ - ha_release_temporary_latches(thd); - - /* A table- or a full flush operation can potentially take a long time to finish. We choose not to wait for them and skip caching statements instead. |