summaryrefslogtreecommitdiff
path: root/sql/sql_class.h
diff options
context:
space:
mode:
Diffstat (limited to 'sql/sql_class.h')
-rw-r--r--sql/sql_class.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h
index ca532ae50b7..b84942d75e6 100644
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -3966,6 +3966,8 @@ public:
void reset_query_timer()
{
#ifndef EMBEDDED_LIBRARY
+ if (spcont || in_sub_stmt || slave_thread)
+ return;
if (!query_timer.expired)
thr_timer_end(&query_timer);
#endif