Merge pull request #2761 from sysown/v2.0.12-kill-query

Fix QPO timeout overflow
6 years ago · e668cc83b5
parent 772d8e32b9 0b3dc1bc6e
commit e668cc83b5
1 changed files with 3 additions and 1 deletions
--- a/lib/MySQL_Session.cpp
+++ b/lib/MySQL_Session.cpp
@ -3605,7 +3605,9 @@ handler_again:
 					mybe->server_myds->wait_until=0;
 					if (qpo) {
 						if (qpo->timeout > 0) {
-							mybe->server_myds->wait_until=thread->curtime+qpo->timeout*1000;
+							unsigned long long qr_timeout=qpo->timeout;
+							mybe->server_myds->wait_until=thread->curtime;
+							mybe->server_myds->wait_until+=qr_timeout*1000;
 						}
 					}
 					if (mysql_thread___default_query_timeout) {