diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-12-20 12:51:57 +0200 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-12-20 12:51:57 +0200 |
| commit | 042f763268c0f209e7c12e0a6a72bb5d204dfe29 (patch) | |
| tree | 7ee15ab50af97cab4135f3712f95ac12fafc74c5 /sql/filesort.cc | |
| parent | cb121a047b55403fe271570c928fd95ed64a1c8f (diff) | |
| parent | 924db8b4ed3f268cbe91a1734611f4dc2311c7be (diff) | |
| download | mariadb-git-042f763268c0f209e7c12e0a6a72bb5d204dfe29.tar.gz | |
Merge remote-tracking branch '5.5' into 10.0
Diffstat (limited to 'sql/filesort.cc')
| -rw-r--r-- | sql/filesort.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/filesort.cc b/sql/filesort.cc index 8a7d5610dc2..873597480a2 100644 --- a/sql/filesort.cc +++ b/sql/filesort.cc @@ -987,7 +987,8 @@ static void make_sortkey(register Sort_param *param, if (maybe_null) *to++=1; char *tmp_buffer= param->tmp_buffer ? param->tmp_buffer : (char*)to; - String tmp(tmp_buffer, param->sort_length, cs); + String tmp(tmp_buffer, param->tmp_buffer ? param->sort_length : + sort_field->length, cs); String *res= item->str_result(&tmp); if (!res) { |