database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge 10.2 into 10.3

Browse Source
This commit is contained in:
Marko Mäkelä
2020-05-29 22:21:19 +03:00
parent 19da9a51ae 38ea795bb6
commit e9aaa10c11
27 changed files with 304 additions and 318 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sql/opt_range.h
View File

@ -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;