diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2019-06-14 07:36:47 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2019-06-14 07:36:47 +0200 |
| commit | 4a3d51c76c131e7b5348d7c714a619f82de32d39 (patch) | |
| tree | 4fb180861c733e364af930529565a7b799c4833a /sql/sql_lex.cc | |
| parent | d9fe615ef6862c85c5aada96d4f5b62b7093177c (diff) | |
| parent | 50653e021f1678c3c28c6b5886fadb9fcf8d87ff (diff) | |
| download | mariadb-git-4a3d51c76c131e7b5348d7c714a619f82de32d39.tar.gz | |
Merge branch '10.2' into 10.3
Diffstat (limited to 'sql/sql_lex.cc')
| -rw-r--r-- | sql/sql_lex.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index ef58dfb2b28..bd9725cbe0f 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -4745,7 +4745,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; } } |