diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-09-19 02:04:45 +0300 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-09-19 02:05:11 +0300 |
| commit | 0f44c8ab28adf0533595a417453765197deb4bfa (patch) | |
| tree | 1648613af322efddc67f56f5f1a9431c5d65c5ed | |
| parent | d6a7de2022756fc1eebe11e4b9e30f33ff541a25 (diff) | |
| download | mariadb-git-0f44c8ab28adf0533595a417453765197deb4bfa.tar.gz | |
Fix merge error
| -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 8dd028c93f5..b562bb0f660 100644 --- a/sql/uniques.cc +++ b/sql/uniques.cc @@ -712,8 +712,8 @@ bool Unique::merge(TABLE *table, uchar *buff, bool without_last_merge) full_size; sort_param.min_dupl_count= min_dupl_count; sort_param.res_length= 0; - sort_param.keys= (uint) MY_MAX((max_in_memory_size / sort_param.sort_length), - MERGEBUFF2); + sort_param.max_keys_per_buffer= + (uint) MY_MAX((max_in_memory_size / sort_param.sort_length), MERGEBUFF2); sort_param.not_killable= 1; sort_param.unique_buff= buff +(sort_param.max_keys_per_buffer * |