diff options
| author | Rucha Deodhar <rucha.deodhar@mariadb.com> | 2020-09-17 19:05:08 +0530 |
|---|---|---|
| committer | Rucha Deodhar <rucha.deodhar@mariadb.com> | 2020-12-15 13:00:24 +0530 |
| commit | 5f4d351d7fe3dcae9f5d76d8027d54fa8392e66a (patch) | |
| tree | 1b3d3301ac66a65832436e25d58b538788005c6a | |
| parent | 384f107ae586a9b4949ec9fd5393959a26d866cd (diff) | |
| download | mariadb-git-5f4d351d7fe3dcae9f5d76d8027d54fa8392e66a.tar.gz | |
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.
| -rw-r--r-- | sql/sql_help.cc | 3 |
1 files changed, 3 insertions, 0 deletions
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); |