diff options
Diffstat (limited to 'storage/perfschema/pfs_variable.cc')
| -rw-r--r-- | storage/perfschema/pfs_variable.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/storage/perfschema/pfs_variable.cc b/storage/perfschema/pfs_variable.cc index bc3227da16a..656a8610362 100644 --- a/storage/perfschema/pfs_variable.cc +++ b/storage/perfschema/pfs_variable.cc @@ -384,7 +384,7 @@ void PFS_system_variable_cache::refresh_one_var(uint index) int PFS_system_variable_cache::make_call(Request_func func, uint param) { int ret= 0; - THD *requestor_thd= current_thd; + THD *requestor_thd= m_current_thd; if (requestor_thd == m_safe_thd) { mysql_mutex_unlock(&m_safe_thd->LOCK_thd_kill); @@ -404,8 +404,9 @@ int PFS_system_variable_cache::make_call(Request_func func, uint param) return 1; } } + DEBUG_SYNC(requestor_thd, "apc_after_notify"); ret= m_safe_thd->apc_target.wait_for_completion(requestor_thd, request, - 30); + 10); if (ret == 0) delete request; } |