diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-02-14 14:09:29 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-02-14 14:09:29 +0100 |
| commit | fb27ce22f77705d394beb6acd7aa4be2ff008890 (patch) | |
| tree | cf1288c289055405cf14f2b9ee408a90948e95ab /sql/sql_select.cc | |
| parent | e2a99f1863a7a4d5d6d22c9f39de3b255c959f98 (diff) | |
| parent | 5a21dc7df1024c13c212f687c5ebc40d9cb74c5b (diff) | |
| download | mariadb-git-fb27ce22f77705d394beb6acd7aa4be2ff008890.tar.gz | |
5.3 merge
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 a773eac1a32..84ccd51004e 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -3214,13 +3214,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)); |