diff options
| author | Sergei Petrunia <sergey@mariadb.com> | 2022-09-28 17:34:22 +0300 |
|---|---|---|
| committer | Sergei Petrunia <sergey@mariadb.com> | 2023-02-02 22:25:06 +0300 |
| commit | 373f7ea72f5d7ace9e05e78f3ecf06981dfcad41 (patch) | |
| tree | 1d7478044fffcb0a2d59c4c999404eeb2fed4927 /sql/opt_range.cc | |
| parent | 5e651c9aea1234c7ee83c38761af251872960335 (diff) | |
| download | mariadb-git-373f7ea72f5d7ace9e05e78f3ecf06981dfcad41.tar.gz | |
Fix compile on Windows: use explicit casts between double and ha_rows.
Diffstat (limited to 'sql/opt_range.cc')
| -rw-r--r-- | sql/opt_range.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/opt_range.cc b/sql/opt_range.cc index ae1524d1fb2..72e9c35f3e9 100644 --- a/sql/opt_range.cc +++ b/sql/opt_range.cc @@ -7374,7 +7374,7 @@ TRP_ROR_INTERSECT *get_best_ror_intersect(const PARAM *param, SEL_TREE *tree, TRP_ROR_INTERSECT *trp= NULL; if (min_cost + cmp_cost < read_time && (cpk_scan || best_num > 1)) { - double best_rows= double2rows(intersect_best->out_rows); + double best_rows= intersect_best->out_rows; set_if_bigger(best_rows, 1); if (!(trp= new (param->mem_root) TRP_ROR_INTERSECT)) DBUG_RETURN(NULL); @@ -7386,8 +7386,8 @@ TRP_ROR_INTERSECT *get_best_ror_intersect(const PARAM *param, SEL_TREE *tree, trp->last_scan= trp->first_scan + best_num; trp->is_covering= intersect_best->is_covering; trp->read_cost= min_cost + cmp_cost; - param->table->set_opt_range_condition_rows(best_rows); - trp->records= best_rows; + param->table->set_opt_range_condition_rows((ha_rows)best_rows); + trp->records= (ha_rows)best_rows; trp->index_scan_costs= intersect_best->index_scan_costs; trp->cpk_scan= cpk_scan; DBUG_PRINT("info", ("Returning non-covering ROR-intersect plan:" |