diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-10-22 13:27:18 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-10-22 13:27:18 +0300 |
| commit | 46957a6a77518b579c6c8e1345666f84a5a59455 (patch) | |
| tree | c0e463f14123cd09bb4d5854d32577e44b3a9827 /sql/sql_show.cc | |
| parent | 1619ae899099c4934f3b5919b2398c95a7cacc94 (diff) | |
| parent | e3d692aa092a76415ce1ce0e9662338873d84abb (diff) | |
| download | mariadb-git-46957a6a77518b579c6c8e1345666f84a5a59455.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'sql/sql_show.cc')
| -rw-r--r-- | sql/sql_show.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 3ffb5338053..d7bd15444d9 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -5313,6 +5313,11 @@ int get_all_tables(THD *thd, TABLE_LIST *tables, COND *cond) free_root(&tmp_mem_root, MY_MARK_BLOCKS_FREE); } } + if (thd->killed == ABORT_QUERY) + { + error= 0; + goto err; + } } } } |