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

Merge 10.4 into 10.5

Browse Source
This commit is contained in:
Marko Mäkelä
2020-05-31 10:28:59 +03:00
parent 0bf843cd13 6da14d7b4a
commit 4a0b56f604
141 changed files with 3170 additions and 952 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sql/opt_range.h
View File

@ -673,6 +673,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;