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

Browse Source
This commit is contained in:
Marko Mäkelä
2018-09-11 21:31:03 +03:00
parent f5bebaf1d6 4901f31c13
commit 1bf3e8ab43
299 changed files with 8442 additions and 1672 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_lex.cc
View File

@ -4765,18 +4765,18 @@ void SELECT_LEX::increase_derived_records(ha_rows records)
return;
}
select_unit *result= (select_unit*)unit->result;
select_result *result= unit->result;
switch (linkage)
{
case INTERSECT_TYPE:
// result of intersect can't be more then one of components
set_if_smaller(result->records, records);
set_if_smaller(result->est_records, records);
case EXCEPT_TYPE:
// in worse case none of record will be removed
break;
default:
// usual UNION
result->records+= records;
result->est_records+= records;
break;
}
}