From 0b3dc1bc6e379529e0ad704d110984c7ed553217 Mon Sep 17 00:00:00 2001
From: Valentin Rakush <valentin@sysown.com>
Date: Fri, 8 May 2020 07:10:52 +0000
Subject: [PATCH] Fix QPO timeout overflow

---
 lib/MySQL_Session.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/MySQL_Session.cpp b/lib/MySQL_Session.cpp
index 756785616..a470df288 100644
--- 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) {