database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Merge branch '5.5' into 10.1

Browse Source
This commit is contained in:
Oleksandr Byelkin
2019-06-12 22:54:46 +02:00
parent 56c60b2fc5 7a7d9904e1
commit 5b65d61d93
36 changed files with 778 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/sql_lex.cc
View File

@@ -4372,7 +4372,10 @@ void SELECT_LEX::increase_derived_records(ha_rows records)
DBUG_ASSERT(unit->derived);
select_union *result= (select_union*)unit->result;
result->records+= records;
if (HA_ROWS_MAX - records > result->records)
result->records+= records;
else
result->records= HA_ROWS_MAX;
}