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.3 into 10.4

Browse Source
This commit is contained in:
Marko Mäkelä
2020-05-30 11:04:27 +03:00
parent 4783494a5e 2e1d10ecac
commit 6da14d7b4a
67 changed files with 1680 additions and 476 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sql/opt_range.h
View File

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