From b8161c7fc4d1f045dd13508aa26ceda076872dd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Canna=C3=B2?= Date: Fri, 18 Sep 2020 13:18:08 +0200 Subject: [PATCH] Allow compile on FreeBSD --- include/MySQL_Thread.h | 2 +- lib/MySQL_Thread.cpp | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/include/MySQL_Thread.h b/include/MySQL_Thread.h index b37fbbbb3..ed055566d 100644 --- a/include/MySQL_Thread.h +++ b/include/MySQL_Thread.h @@ -151,10 +151,10 @@ class MySQL_Thread void idle_thread_check_if_worker_thread_has_unprocess_resumed_sessions_and_signal_it(MySQL_Thread *thr); void idle_thread_prepares_session_to_send_to_worker_thread(int i); void idle_thread_to_kill_idle_sessions(); + bool move_session_to_idle_mysql_sessions(MySQL_Data_Stream *myds, unsigned int n); #endif // IDLE_THREADS unsigned int find_session_idx_in_mysql_sessions(MySQL_Session *sess); - bool move_session_to_idle_mysql_sessions(MySQL_Data_Stream *myds, unsigned int n); bool set_backend_to_be_skipped_if_frontend_is_slow(MySQL_Data_Stream *myds, unsigned int n); void handle_mirror_queue_mysql_sessions(); void handle_kill_queues(); diff --git a/lib/MySQL_Thread.cpp b/lib/MySQL_Thread.cpp index 230861faf..54d114710 100644 --- a/lib/MySQL_Thread.cpp +++ b/lib/MySQL_Thread.cpp @@ -6258,6 +6258,7 @@ void MySQL_Thread::Scan_Sessions_to_Kill(PtrArray *mysess) { } } +#ifdef IDLE_THREADS bool MySQL_Thread::move_session_to_idle_mysql_sessions(MySQL_Data_Stream *myds, unsigned int n) { unsigned long long _tmp_idle = mypolls.last_recv[n] > mypolls.last_sent[n] ? mypolls.last_recv[n] : mypolls.last_sent[n] ; if (_tmp_idle < ( (curtime > (unsigned int)mysql_thread___session_idle_ms * 1000) ? (curtime - mysql_thread___session_idle_ms * 1000) : 0)) { @@ -6290,6 +6291,7 @@ bool MySQL_Thread::move_session_to_idle_mysql_sessions(MySQL_Data_Stream *myds, } return false; } +#endif // IDLE_THREADS bool MySQL_Thread::set_backend_to_be_skipped_if_frontend_is_slow(MySQL_Data_Stream *myds, unsigned int n) { if (myds->sess && myds->sess->client_myds && myds->sess->mirror==false) { @@ -6307,6 +6309,7 @@ bool MySQL_Thread::set_backend_to_be_skipped_if_frontend_is_slow(MySQL_Data_Stre return false; } +#ifdef IDLE_THREADS void MySQL_Thread::idle_thread_gets_sessions_from_worker_thread() { pthread_mutex_lock(&myexchange.mutex_idles); while (myexchange.idle_mysql_sessions->len) { @@ -6326,6 +6329,7 @@ void MySQL_Thread::idle_thread_gets_sessions_from_worker_thread() { } pthread_mutex_unlock(&myexchange.mutex_idles); } +#endif // IDLE_THREADS void MySQL_Thread::handle_mirror_queue_mysql_sessions() { while (mirror_queue_mysql_sessions->len) {