diff options
| author | Sergey Glukhov <Sergey.Glukhov@sun.com> | 2010-02-05 13:39:46 +0400 |
|---|---|---|
| committer | Sergey Glukhov <Sergey.Glukhov@sun.com> | 2010-02-05 13:39:46 +0400 |
| commit | 2be07c70947924c9829ad58dd1ee9d1f4228c401 (patch) | |
| tree | 8c27cb07e2a58d8e61bdb095b1be1de3bc22a392 /sql/table.cc | |
| parent | 128c9be664caa06142ad299c1a3bf17426468a65 (diff) | |
| download | mariadb-git-2be07c70947924c9829ad58dd1ee9d1f4228c401.tar.gz | |
Bug#47736 killing a select from a view when the view is processing a function, asserts
hide_view_error() does not take into account that thread query may be killed.
Added a check for thd->killed.
Addon: backported bug32140 fix from 6.0
mysql-test/r/sp_notembedded.result:
test case
mysql-test/t/sp_notembedded.test:
test case
sql/sp.cc:
backported bug32140 fix from 6.0
sql/table.cc:
Added a check for thd->killed.
Diffstat (limited to 'sql/table.cc')
| -rw-r--r-- | sql/table.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/table.cc b/sql/table.cc index c06ecf99926..8a8228b9954 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -3365,7 +3365,7 @@ bool TABLE_LIST::prep_check_option(THD *thd, uint8 check_opt_type) void TABLE_LIST::hide_view_error(THD *thd) { - if (thd->get_internal_handler()) + if (thd->killed || thd->get_internal_handler()) return; /* Hide "Unknown column" or "Unknown function" error */ DBUG_ASSERT(thd->is_error()); |