From 00bf48827f45e0b0d164d474ced6fb30d923c5fd Mon Sep 17 00:00:00 2001
From: Rucha Deodhar <rucha.deodhar@mariadb.com>
Date: Thu, 8 Oct 2020 23:05:35 +0530
Subject: MDEV-23445: LIMIT ROWS EXAMINED throws error in Debug build only
Analysis: When we reach the maximum limit to examine rows killed_state is set
as ABORT. But this isn't an actual error and we still return TRUE. This
eventually sets error as UNKNOWN ERROR.
Fix: Check if need to stop execution by checking the killed state. If we have
to abort it, return false because this isn't an actual error.
---
sql/sql_show.cc | 5 +++++
1 file changed, 5 insertions(+)
(limited to 'sql/sql_show.cc')
diff --git a/sql/sql_show.cc b/sql/sql_show.cc
index b9c914f9545..0fe8b707472 100644
--- a/sql/sql_show.cc
+++ b/sql/sql_show.cc
@@ -5273,6 +5273,11 @@ int get_all_tables(THD *thd, TABLE_LIST *tables, COND *cond)
free_root(&tmp_mem_root, MY_MARK_BLOCKS_FREE);
}
}
+ if (thd->killed == ABORT_QUERY)
+ {
+ error= 0;
+ goto err;
+ }
}
}
}
--
cgit v1.2.1