diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2021-01-06 10:53:00 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2021-01-06 10:53:00 +0100 |
| commit | 02e7bff882c5169ba3e1ce7e9a93d4c28fe3afd1 (patch) | |
| tree | 4a6a8d578fedb4c2b1f437ab39c2d7430ad95163 /sql/sql_help.cc | |
| parent | 5f10870c8a8c2448bfc26d990110390d48000b84 (diff) | |
| parent | 478b83032b170b2ae030fa77fe4bed60a7910472 (diff) | |
| download | mariadb-git-02e7bff882c5169ba3e1ce7e9a93d4c28fe3afd1.tar.gz | |
Merge commit '10.4' into 10.5
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 e31e51d0316..ebda874d1fe 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); |