diff options
Diffstat (limited to 'sql/uniques.h')
| -rw-r--r-- | sql/uniques.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sql/uniques.h b/sql/uniques.h index a4f5b378fb0..7e12a391fbd 100644 --- a/sql/uniques.h +++ b/sql/uniques.h @@ -45,7 +45,7 @@ class Unique :public Sql_alloc always 0 for unions, > 0 for intersections */ bool with_counters; - bool merge(TABLE *table, uchar *buff, bool without_last_merge); + bool merge(TABLE *table, uchar *buff, size_t size, bool without_last_merge); bool flush(); public: @@ -72,13 +72,14 @@ public: bool get(TABLE *table); /* Cost of searching for an element in the tree */ - inline static double get_search_cost(ulonglong tree_elems, uint compare_factor) + inline static double get_search_cost(ulonglong tree_elems, + double compare_factor) { return log((double) tree_elems) / (compare_factor * M_LN2); } static double get_use_cost(uint *buffer, size_t nkeys, uint key_size, - size_t max_in_memory_size, uint compare_factor, + size_t max_in_memory_size, double compare_factor, bool intersect_fl, bool *in_memory); inline static int get_cost_calc_buff_size(size_t nkeys, uint key_size, size_t max_in_memory_size) |