From 5f4d351d7fe3dcae9f5d76d8027d54fa8392e66a Mon Sep 17 00:00:00 2001
From: Rucha Deodhar <rucha.deodhar@mariadb.com>
Date: Thu, 17 Sep 2020 19:05:08 +0530
Subject: MDEV-22422: Assertion `! is_set()' failed in
 Diagnostics_area::set_eof_status

Analysis: The error is not returned when the statement can't be used.
And so we still go on to search for keywords.
Fix: Return the error state.
---
 sql/sql_help.cc | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'sql/sql_help.cc')

diff --git a/sql/sql_help.cc b/sql/sql_help.cc
index c05c9a7d229..5ae9d3beb8b 100644
--- a/sql/sql_help.cc
+++ b/sql/sql_help.cc
@@ -741,6 +741,9 @@ static bool mysqld_help_internal(THD *thd, const char *mask)
 			      &name, &description, &example);
   delete select;
 
+  if (thd->is_error())
+    goto error;
+
   if (count_topics == 0)
   {
     int UNINIT_VAR(key_id);
-- 
cgit v1.2.1