diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-07-27 17:52:37 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-07-27 17:52:37 +0300 |
| commit | 30914389fe9ca13cf29470dd033a5cf6997a3931 (patch) | |
| tree | fac7ab85411e556db4759a9a2c063ef27b851f87 /sql/sql_class.cc | |
| parent | 772e3f61eb2956143bbdb1d85490bd5aad73d43c (diff) | |
| parent | 098c0f2634a35e24e9eb0f06d3fba69d0d097657 (diff) | |
| download | mariadb-git-30914389fe9ca13cf29470dd033a5cf6997a3931.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'sql/sql_class.cc')
| -rw-r--r-- | sql/sql_class.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 658909c5961..7b229082822 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -1876,7 +1876,7 @@ void add_diff_to_status(STATUS_VAR *to_var, STATUS_VAR *from_var, extern std::atomic<my_thread_id> shutdown_thread_id; void THD::awake_no_mutex(killed_state state_to_set) { - DBUG_ENTER("THD::awake"); + DBUG_ENTER("THD::awake_no_mutex"); DBUG_PRINT("enter", ("this: %p current_thd: %p state: %d", this, current_thd, (int) state_to_set)); THD_CHECK_SENTRY(this); |