diff options
| author | Rucha Deodhar <rucha.deodhar@mariadb.com> | 2020-09-17 19:05:08 +0530 |
|---|---|---|
| committer | Rucha Deodhar <rucha.deodhar@mariadb.com> | 2020-09-22 17:18:37 +0530 |
| commit | 9c2570e6c42a5ff4965a7d7ee122ad1ae9e73428 (patch) | |
| tree | 63db1b4aec0ed520cedce14dc9f610d9929a0bf9 /sql/sql_help.cc | |
| parent | 5768f57d243e3fa945d79fcdc1a3eacb1e4ebb0d (diff) | |
| download | mariadb-git-bb-10.1-MDEV-22422.tar.gz | |
MDEV-22422: Assertion `! is_set()' failed in Diagnostics_area::set_eof_statusbb-10.1-MDEV-22422
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.
Diffstat (limited to 'sql/sql_help.cc')
| -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 cd9da566e51..654a3915b29 100644 --- a/sql/sql_help.cc +++ b/sql/sql_help.cc @@ -736,6 +736,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); |