From 910ddb99fdc18503f9c22476b94147bafd640e48 Mon Sep 17 00:00:00 2001 From: Johan Wikman Date: Mon, 23 Nov 2015 18:25:48 +0200 Subject: [PATCH] Reset sessionid upon exit. Since the sessionid is now unconditionally set, it also needs to be unconditionally reset. --- server/core/dcb.c | 5 +---- server/core/poll.c | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/server/core/dcb.c b/server/core/dcb.c index b006de1ec..5e9ac8be2 100644 --- a/server/core/dcb.c +++ b/server/core/dcb.c @@ -629,10 +629,7 @@ dcb_process_victim_queue(DCB *listofdcb) dcb = nextdcb; } /** Reset threads session data */ - if (LOG_IS_ENABLED(LOGFILE_TRACE)) - { - tls_log_info.li_sesid = 0; - } + tls_log_info.li_sesid = 0; } /** diff --git a/server/core/poll.c b/server/core/poll.c index 0d48979c8..1d5dc7058 100644 --- a/server/core/poll.c +++ b/server/core/poll.c @@ -1075,10 +1075,7 @@ unsigned long qtime; } dcb->evq.processing = 0; /** Reset session id from thread's local storage */ - if (LOG_IS_ENABLED(LOGFILE_TRACE)) - { - tls_log_info.li_sesid = 0; - } + tls_log_info.li_sesid = 0; spinlock_release(&pollqlock); return 1;