diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-02-13 20:20:17 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-02-13 20:20:17 +0100 |
| commit | 4b57720caabb434c055bb67b6cf73e51cb044138 (patch) | |
| tree | 352cde07665f45b1379b98fce79fc26f5ae5faee /sql/sql_select.cc | |
| parent | 642495345f0b35e87db4e8e2f4cfd0b3df724019 (diff) | |
| download | mariadb-git-4b57720caabb434c055bb67b6cf73e51cb044138.tar.gz | |
use a different error for MySQL bug#11747970 - kill the query,
as it was supposed to be in bug#11747970, don't fake an error.
(this kill can be useful for other bugs too)
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 235383622cb..6f96a432a97 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -3154,13 +3154,7 @@ make_join_statistics(JOIN *join, List<TABLE_LIST> &tables_list, #endif DBUG_EXECUTE_IF("bug11747970_raise_error", - { - if (!error) - { - my_error(ER_UNKNOWN_ERROR, MYF(0)); - goto error; - } - }); + { join->thd->killed= KILL_QUERY_HARD; }); if (error) { table->file->print_error(error, MYF(0)); |