summaryrefslogtreecommitdiff
path: root/sql/sql_parse.cc
diff options
context:
space:
mode:
authorDaniel Black <daniel@mariadb.org>2022-12-04 10:47:31 +1100
committerDaniel Black <daniel@mariadb.org>2022-12-14 10:15:32 +1100
commit697dbd15e0102f33fba1d1d6d9aa964b638f9534 (patch)
treede19d57a7afa83d320a330d0cdf444be9a0be4c3 /sql/sql_parse.cc
parentacfaa0458725708aa58970a34072d08c184d7856 (diff)
downloadmariadb-git-697dbd15e0102f33fba1d1d6d9aa964b638f9534.tar.gz
MDEV-21187: log_slow_filter="" logs queries not using indexes
Consistent with MDEV-4206 and empty log_slow_filter still means no explict filtering. Since 21518ab2e453 however the log_queries_not_using_indexes became stored in the same variable. As we need to test for the absense of log_queries_not_using_indexes the SERVER_QUERY_NO_INDEX USED part of log_slow_statement, the empty criteria resulted in an always true to log queries not using indexes if log_slow_filter was set to empty. Adjusted the log_slow.test for MDEV-4206 as slow_log_query has been global and session for a while and it was relying on the MDEV-21187 buggy behavior to detect a slow query. Reviewer: Monty
Diffstat (limited to 'sql/sql_parse.cc')
-rw-r--r--sql/sql_parse.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index 385360168a1..cf316c8cc1c 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -2513,7 +2513,7 @@ void log_slow_statement(THD *thd)
if ((thd->server_status &
(SERVER_QUERY_NO_INDEX_USED | SERVER_QUERY_NO_GOOD_INDEX_USED)) &&
!(thd->query_plan_flags & QPLAN_STATUS) &&
- !slow_filter_masked(thd, QPLAN_NOT_USING_INDEX))
+ (thd->variables.log_slow_filter & QPLAN_NOT_USING_INDEX))
{
thd->query_plan_flags|= QPLAN_NOT_USING_INDEX;
/* We are always logging no index queries if enabled in filter */