diff options
| author | monty@mysql.com/nosik.monty.fi <> | 2006-11-28 00:47:21 +0200 |
|---|---|---|
| committer | monty@mysql.com/nosik.monty.fi <> | 2006-11-28 00:47:21 +0200 |
| commit | 9c3a2a0d8e492f6595d82290fc17f2279dd9707a (patch) | |
| tree | 6f911f150de38ce4738b30731deaf7bab1ad02d1 /sql/uniques.cc | |
| parent | 501333f694a0aaeeae1e9b0b8b5019d8c6357905 (diff) | |
| download | mariadb-git-9c3a2a0d8e492f6595d82290fc17f2279dd9707a.tar.gz | |
Increased heap max length to > 4G for 64 bit machines
Initialize key_part->type on open. This caused key_copy() to fail for bit_fields. (key_copy is used in HANDLER and opt_range)
Diffstat (limited to 'sql/uniques.cc')
| -rw-r--r-- | sql/uniques.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/uniques.cc b/sql/uniques.cc index ad074f8b2b0..ac603791376 100644 --- a/sql/uniques.cc +++ b/sql/uniques.cc @@ -55,7 +55,7 @@ int unique_write_to_ptrs(gptr key, element_count count, Unique *unique) } Unique::Unique(qsort_cmp2 comp_func, void * comp_func_fixed_arg, - uint size_arg, ulong max_in_memory_size_arg) + uint size_arg, ulonglong max_in_memory_size_arg) :max_in_memory_size(max_in_memory_size_arg), size(size_arg), elements(0) { my_b_clear(&file); @@ -260,7 +260,7 @@ static double get_merge_many_buffs_cost(uint *buffer, */ double Unique::get_use_cost(uint *buffer, uint nkeys, uint key_size, - ulong max_in_memory_size) + ulonglong max_in_memory_size) { ulong max_elements_in_tree; ulong last_tree_elems; |