diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-30 11:04:27 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-30 11:04:27 +0300 |
| commit | 6da14d7b4a935466de55a6aa87db14bc359dbd30 (patch) | |
| tree | a2d1a73a6bf6bbe0dab2857fd87fa782969412f4 /sql/opt_range.h | |
| parent | 4783494a5e21939424ecca92bf23d2df65528266 (diff) | |
| parent | 2e1d10ecacc8ccfc0bda8a199c741ee36df981be (diff) | |
| download | mariadb-git-6da14d7b4a935466de55a6aa87db14bc359dbd30.tar.gz | |
Merge 10.3 into 10.4
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 73def7bde92..11d9f80865a 100644 --- a/sql/opt_range.h +++ b/sql/opt_range.h @@ -672,6 +672,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; |