diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-01-18 10:43:31 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-01-18 10:43:31 +0200 |
| commit | a0d3ead83afe7b678c6e2a3ef3a43d05d0093a20 (patch) | |
| tree | e0beb1202b3890be3a3890eb03f9dfea3c874806 | |
| parent | 5f60c7c3c23c5f20fd9a8074aa72df00e13a1c5c (diff) | |
| parent | 37ffdb44ef96bacac8981cf180bb47be5da486df (diff) | |
| download | mariadb-git-a0d3ead83afe7b678c6e2a3ef3a43d05d0093a20.tar.gz | |
Merge 10.2 into 10.3
| -rw-r--r-- | storage/innobase/handler/ha_innodb.cc | 5 | ||||
| -rw-r--r-- | storage/innobase/row/row0mysql.cc | 7 |
2 files changed, 8 insertions, 4 deletions
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index a4eca350c51..df3e8165288 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -291,11 +291,12 @@ thd_destructor_proxy(void *) mysql_cond_init(PSI_NOT_INSTRUMENTED, &thd_destructor_cond, 0); st_my_thread_var *myvar= _my_thread_var(); + myvar->current_mutex = &thd_destructor_mutex; + myvar->current_cond = &thd_destructor_cond; + THD *thd= create_thd(); thd_proc_info(thd, "InnoDB shutdown handler"); - myvar->current_mutex = &thd_destructor_mutex; - myvar->current_cond = &thd_destructor_cond; mysql_mutex_lock(&thd_destructor_mutex); my_atomic_storeptr_explicit(reinterpret_cast<void**>(&srv_running), diff --git a/storage/innobase/row/row0mysql.cc b/storage/innobase/row/row0mysql.cc index 8bc9fdc7cae..80a3d2f046b 100644 --- a/storage/innobase/row/row0mysql.cc +++ b/storage/innobase/row/row0mysql.cc @@ -1,7 +1,7 @@ /***************************************************************************** Copyright (c) 2000, 2018, Oracle and/or its affiliates. All Rights Reserved. -Copyright (c) 2015, 2018, MariaDB Corporation. +Copyright (c) 2015, 2019, 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 @@ -3414,8 +3414,11 @@ row_drop_table_for_mysql( calling btr_search_drop_page_hash_index() while we hold the InnoDB dictionary lock, we will drop any adaptive hash index entries upfront. */ + bool immune = is_temp_name + || strstr(table->name.m_name, "/FTS"); + while (buf_LRU_drop_page_hash_for_tablespace(table)) { - if ((!is_temp_name && trx_is_interrupted(trx)) + if ((!immune && trx_is_interrupted(trx)) || srv_shutdown_state != SRV_SHUTDOWN_NONE) { err = DB_INTERRUPTED; |