diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2021-01-11 08:34:04 +0200 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2021-01-11 08:34:04 +0200 |
| commit | d1aea01dd3438225a2adcca19d79f7a9ff22c8f8 (patch) | |
| tree | a6fec29df398b8abf2e51dd18c117d84ca04d783 /sql/sql_class.h | |
| parent | 3b548d3bbf888e7c9e9853cf826e528b5195d8bd (diff) | |
| download | mariadb-git-bb-10.2-MDEV-23536.tar.gz | |
MDEV-23536 : Race condition between KILL and transaction commitbb-10.2-MDEV-23536
Fix test regression. We need to pass information do we hold
THD::LOCK_thd_data mutex to close_thread_table,
close_thread_tables and Locked_tables_list::unlock_locked_tables
because unlock_locked_tables would otherwise take it.
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index a97f64c13b3..714821f4c46 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -1845,7 +1845,7 @@ public: init_sql_alloc(&m_locked_tables_root, MEM_ROOT_BLOCK_SIZE, 0, MYF(MY_THREAD_SPECIFIC)); } - void unlock_locked_tables(THD *thd); + void unlock_locked_tables(THD *thd, bool have_mutex=false); void unlock_locked_table(THD *thd, MDL_ticket *mdl_ticket); ~Locked_tables_list() { |