database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge 10.2 into 10.3

Browse Source
This commit is contained in:
Marko Mäkelä
2020-03-30 11:12:56 +03:00
parent 0fb84216a3 b11ff3d495
commit 1a9b6c4c7f
70 changed files with 958 additions and 727 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/sql_select.cc
View File

@ -2626,8 +2626,12 @@ int JOIN::optimize_stage2()
having_is_correlated= MY_TEST(having->used_tables() & OUTER_REF_TABLE_BIT);
tmp_having= having;
if ((select_lex->options & OPTION_SCHEMA_TABLE))
optimize_schema_tables_reads(this);
if ((select_lex->options & OPTION_SCHEMA_TABLE) &&
optimize_schema_tables_reads(this))
DBUG_RETURN(TRUE);
if (unlikely(thd->is_error()))
DBUG_RETURN(TRUE);
/*
The loose index scan access method guarantees that all grouping or