1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00

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.
This commit is contained in:
Oleksandr Byelkin
2015-05-21 16:31:24 +02:00
parent 34e01f80e4
commit 1b00edc49a
3 changed files with 65 additions and 0 deletions

View File

@ -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