From dd3b7e5a822ef8ed864a051c17f6a216880fc1f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Canna=C3=B2?= Date: Wed, 6 Jan 2016 15:07:09 +0000 Subject: [PATCH] Removed any reference to MySQL_Session::pause the variable wasn't in used from long time --- include/MySQL_Session.h | 1 - lib/MySQL_Session.cpp | 1 - lib/MySQL_Thread.cpp | 3 +-- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/include/MySQL_Session.h b/include/MySQL_Session.h index a1e365873..934f1aa72 100644 --- a/include/MySQL_Session.h +++ b/include/MySQL_Session.h @@ -100,7 +100,6 @@ class MySQL_Session int pending_connect; Query_Info CurrentQuery; //void *query_parser_args; - unsigned long long pause; unsigned long long pause_until; //MySQL_Session_userinfo userinfo_client; //MySQL_Session_userinfo userinfo_server; diff --git a/lib/MySQL_Session.cpp b/lib/MySQL_Session.cpp index b63ee5860..842ee51b3 100644 --- a/lib/MySQL_Session.cpp +++ b/lib/MySQL_Session.cpp @@ -160,7 +160,6 @@ void MySQL_Session::operator delete(void *ptr) { MySQL_Session::MySQL_Session() { thread_session_id=0; - pause=0; pause_until=0; qpo=NULL; command_counters=new StatCounters(15,10,false); diff --git a/lib/MySQL_Thread.cpp b/lib/MySQL_Thread.cpp index 7cfa88a8d..d4e5ddfd5 100644 --- a/lib/MySQL_Thread.cpp +++ b/lib/MySQL_Thread.cpp @@ -1698,8 +1698,7 @@ void MySQL_Thread::process_all_sessions() { n--; delete sess; } else { - if (sess->to_process==1 || sess->pause<=curtime ) { - if (sess->pause <= curtime ) sess->pause=0; + if (sess->to_process==1) { if (sess->pause_until <= curtime) { rc=sess->handler(); if (rc==-1 || sess->killed==true) {