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 branch '10.3' into 10.4

Browse Source
This commit is contained in:
Oleksandr Byelkin
2019-06-14 22:10:50 +02:00
parent 772c5f3c78 1135244a64
commit f66d1850ac
86 changed files with 2305 additions and 2514 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/sql_lex.cc
View File

@ -4862,7 +4862,10 @@ void SELECT_LEX::increase_derived_records(ha_rows records)
break;
default:
// usual UNION
result->est_records+= records;
if (HA_ROWS_MAX - records > result->est_records)
result->est_records+= records;
else
result->est_records= HA_ROWS_MAX;
break;
}
}