summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@mariadb.com>2017-10-23 22:01:19 +0000
committerVladislav Vaintroub <wlad@mariadb.com>2017-10-23 22:01:19 +0000
commit4ec88ea9c3ec52d996b39167d12a61ab95fdeacc (patch)
tree1883acf21928d8a5ed94597caea00d674d2a76db
parent9d47c4cfdbc7cc4e65015bd373f3a6c2e0f491bd (diff)
downloadmariadb-git-4ec88ea9c3ec52d996b39167d12a61ab95fdeacc.tar.gz
Fix a warning on Win64
-rw-r--r--sql/opt_range.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/opt_range.cc b/sql/opt_range.cc
index 9416fc30a0c..3d9c1aef4b8 100644
--- a/sql/opt_range.cc
+++ b/sql/opt_range.cc
@@ -4643,7 +4643,7 @@ TABLE_READ_PLAN *get_best_disjunct_quick(PARAM *param, SEL_IMERGE *imerge,
double roru_index_costs;
ha_rows roru_total_records;
double roru_intersect_part= 1.0;
- ulong n_child_scans;
+ size_t n_child_scans;
DBUG_ENTER("get_best_disjunct_quick");
DBUG_PRINT("info", ("Full table scan cost: %g", read_time));
@@ -4878,7 +4878,7 @@ skip_to_ror_scan:
(TIME_FOR_COMPARE_ROWID * M_LN2) +
get_sweep_read_cost(param, roru_total_records);
- DBUG_PRINT("info", ("ROR-union: cost %g, %lu members",
+ DBUG_PRINT("info", ("ROR-union: cost %g, %zu members",
roru_total_cost, n_child_scans));
TRP_ROR_UNION* roru;
if (roru_total_cost < read_time)