diff options
Diffstat (limited to 'sql/opt_range.cc')
| -rw-r--r-- | sql/opt_range.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/opt_range.cc b/sql/opt_range.cc index 80d67d884bf..7d65c85129b 100644 --- a/sql/opt_range.cc +++ b/sql/opt_range.cc @@ -11772,7 +11772,7 @@ int read_keys_and_merge_scans(THD *thd, } DBUG_ASSERT(file->ref_length == unique->get_size()); - DBUG_ASSERT(thd->variables.sortbuff_size == unique->get_max_in_memory_size()); + DBUG_ASSERT(thd->variables.sortbuff_size <= unique->get_max_in_memory_size()); for (;;) { @@ -11815,7 +11815,7 @@ int read_keys_and_merge_scans(THD *thd, continue; cur_quick->file->position(cur_quick->record); - if (unique->unique_add((char*)cur_quick->file->ref)) + if (unique->unique_add((char*)cur_quick->file->ref, unique->get_size())) goto err; } |