From 6164f9c84f702b8639949e4b96ebc8b803c0bb9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Canna=C3=B2?= Date: Sat, 26 Sep 2015 23:37:31 +0000 Subject: [PATCH] Fixing a wrong computation of query_timeout --- lib/MySQL_Session.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/MySQL_Session.cpp b/lib/MySQL_Session.cpp index 16905b1c5..9585400cf 100644 --- a/lib/MySQL_Session.cpp +++ b/lib/MySQL_Session.cpp @@ -699,9 +699,9 @@ handler_again: if (mysql_thread___default_query_timeout) { if (mybe->server_myds->wait_until==0) { mybe->server_myds->wait_until=thread->curtime; + unsigned long long def_query_timeout=mysql_thread___default_query_timeout; + mybe->server_myds->wait_until+=def_query_timeout*1000; } - unsigned long long def_query_timeout=mysql_thread___default_query_timeout; - mybe->server_myds->wait_until+=def_query_timeout*1000; } } int rc=myconn->async_query(myds->revents, myds->mysql_real_query.QueryPtr,myds->mysql_real_query.QuerySize);