diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-06-19 16:56:13 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-06-19 16:56:13 +0300 |
| commit | 3a7201ea922f6d3373924c413fdb4b108f6208c5 (patch) | |
| tree | 1dd4316340daba50d6d1f684c7137b47c7799541 /sql/sql_cache.cc | |
| parent | 578d8bfde53c42245f2a0641e7cc2af2ed8230cc (diff) | |
| parent | c73fa2d75fac7a057ae817bfaf142adb87ff2500 (diff) | |
| download | mariadb-git-3a7201ea922f6d3373924c413fdb4b108f6208c5.tar.gz | |
Merge 10.2 into bb-10.2-ext
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 b2927c89fda..89afef4eaf7 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. |