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

MDEV-35086 Trying to lock mutex when the mutex was already locked (session_tracker.cc), server hangs

Browse Source 
followup for 9021f40b8ebf
This commit is contained in:
Sergei Golubchik 2024-10-06 17:06:07 +02:00
parent 3ea71a2c8e
commit 23d7dc1ea1
3 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mysql-test/main/session_tracker_last_gtid.result → mysql-test/main/session_tracker_sysvar.result
View File

@ -28,3 +28,12 @@ drop table t1;
-- last_gtid: 0-1-1002 -- last_gtid: 0-1-1002
reset master; reset master;
#
# MDEV-35086 Trying to lock mutex when the mutex was already locked (session_tracker.cc), server hangs
#
set session_track_system_variables='*';
alter table t1 nowait force;
ERROR 42S02: Table 'test.t1' doesn't exist
use mysql;
set session_track_system_variables=default;
# End of 10.5 tests

11
mysql-test/main/session_tracker_last_gtid.test → mysql-test/main/session_tracker_sysvar.test
View File

@ -18,3 +18,14 @@ drop table t1;
--disable_session_track_info --disable_session_track_info
reset master; reset master;
--echo #
--echo # MDEV-35086 Trying to lock mutex when the mutex was already locked (session_tracker.cc), server hangs
--echo #
set session_track_system_variables='*';
--error ER_NO_SUCH_TABLE
alter table t1 nowait force;
use mysql;
set session_track_system_variables=default;
--echo # End of 10.5 tests

1
sql/session_tracker.cc
View File

@ -433,6 +433,7 @@ bool Session_sysvars_tracker::vars_list::store(THD *thd, String *buf)
if (!*node->test_load) if (!*node->test_load)
{ {
mysql_mutex_unlock(&LOCK_plugin); mysql_mutex_unlock(&LOCK_plugin);
mysql_mutex_unlock(&LOCK_global_system_variables);
continue; continue;
} }
sys_var *svar= node->m_svar; sys_var *svar= node->m_svar;