diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2015-05-21 16:31:24 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2015-05-29 11:43:02 +0200 |
| commit | 1b00edc49a2f1e0a1995fc0562639d90d4c19ca2 (patch) | |
| tree | c8259eed296263c5c2fd33ea5f5aa929e8be7f8e /sql/sql_class.h | |
| parent | 34e01f80e4b68aa4fc9791637c516cdafdf03d5b (diff) | |
| download | mariadb-git-1b00edc49a2f1e0a1995fc0562639d90d4c19ca2.tar.gz | |
MDEV-7011: MAX_STATEMENT_TIME has no effect in a procedure after a previous successful statement
Do not reset timer inside stored procedures and functions.
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 2 |
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 |