diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-29 22:21:19 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-29 22:21:19 +0300 |
| commit | e9aaa10c116370ca581bd1b6f7cc360b43938674 (patch) | |
| tree | 49620196fc57cba1180ffee48695618ec1a36417 /sql/opt_range.h | |
| parent | 19da9a51ae174785806c87bcc8fa47406af9ed96 (diff) | |
| parent | 38ea795bb622cce6f7178291ed737ca7396a124a (diff) | |
| download | mariadb-git-e9aaa10c116370ca581bd1b6f7cc360b43938674.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'sql/opt_range.h')
| -rw-r--r-- | sql/opt_range.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/opt_range.h b/sql/opt_range.h index 71b145ac888..84b1cd08ba8 100644 --- a/sql/opt_range.h +++ b/sql/opt_range.h @@ -667,6 +667,7 @@ public: bool statement_should_be_aborted() const { return + thd->killed || thd->is_fatal_error || thd->is_error() || alloced_sel_args > SEL_ARG::MAX_SEL_ARGS; |