diff options
author | Oleksandr Byelkin <sanja@mariadb.com> | 2020-12-25 09:13:28 +0100 |
---|---|---|
committer | Oleksandr Byelkin <sanja@mariadb.com> | 2020-12-25 09:13:28 +0100 |
commit | 478b83032b170b2ae030fa77fe4bed60a7910472 (patch) | |
tree | a3893bb725e227dc15c6997731cdeba622ae1744 /sql/sql_help.cc | |
parent | 0aa02567dd62d96467f84ba96cc67b103f63c9e0 (diff) | |
parent | 043bd85a574a88856ab9c6d497e682ed06fe45e9 (diff) | |
download | mariadb-git-478b83032b170b2ae030fa77fe4bed60a7910472.tar.gz |
Merge branch '10.3' into 10.4bb-10.4-MDEV-23468
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 e5f1e958d99..81e5ad48e7e 100644 --- a/sql/sql_help.cc +++ b/sql/sql_help.cc @@ -742,6 +742,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); |