diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-10-21 14:02:04 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-10-21 14:02:04 +0300 |
| commit | 620ea816adeceaba7c875679ab8505f4c07a22b8 (patch) | |
| tree | a52749e4f0c1fd07bc9f0c2a1159706a4e7789c3 /sql/sql_select.cc | |
| parent | a1b6691f93e50ad4a8a53dbf89ba578d6a64b2cb (diff) | |
| parent | b4c225ac354686242b5336da84b7a758640936bd (diff) | |
| download | mariadb-git-620ea816adeceaba7c875679ab8505f4c07a22b8.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 19a9cdad184..3b090093060 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -383,11 +383,14 @@ bool handle_select(THD *thd, LEX *lex, select_result *result, If LIMIT ROWS EXAMINED interrupted query execution, issue a warning, continue with normal processing and produce an incomplete query result. */ + bool saved_abort_on_warning= thd->abort_on_warning; + thd->abort_on_warning= false; push_warning_printf(thd, Sql_condition::WARN_LEVEL_WARN, ER_QUERY_EXCEEDED_ROWS_EXAMINED_LIMIT, ER_THD(thd, ER_QUERY_EXCEEDED_ROWS_EXAMINED_LIMIT), thd->accessed_rows_and_keys, thd->lex->limit_rows_examined->val_uint()); + thd->abort_on_warning= saved_abort_on_warning; thd->reset_killed(); } /* Disable LIMIT ROWS EXAMINED after query execution. */ |