diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-03-13 07:20:36 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-03-13 07:20:36 +0200 |
| commit | 32904dc5fac36bffeacc75512f0444c8817a39ce (patch) | |
| tree | ad5809c25e6d0e577d6433a67482735262328c5f /sql | |
| parent | 5257bcfc7afad9068ccb7f5f1777c03aa5bedb12 (diff) | |
| parent | 7b082fb099348da664cf9b35f75eab54deba3b29 (diff) | |
| download | mariadb-git-32904dc5fac36bffeacc75512f0444c8817a39ce.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_select.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 59bb4ac1e81..97002ef071f 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -4599,7 +4599,7 @@ make_join_statistics(JOIN *join, List<TABLE_LIST> &tables_list, for (i= 0; i < join->table_count ; i++) if (double rr= join->best_positions[i].records_read) records= COST_MULT(records, rr); - ha_rows rows= records > HA_ROWS_MAX ? HA_ROWS_MAX : (ha_rows) records; + ha_rows rows= records > (double) HA_ROWS_MAX ? HA_ROWS_MAX : (ha_rows) records; set_if_smaller(rows, unit->select_limit_cnt); join->select_lex->increase_derived_records(rows); } |