diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-12-20 13:30:05 +0200 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-12-20 13:30:05 +0200 |
| commit | e3d89652e5fd314f03875a3d026490452b2a5986 (patch) | |
| tree | 9f4d60e4431933ba6e53feb3372c9297c8b8836c /sql/filesort.cc | |
| parent | 7bbc6c14d1e8fcf1f4737e0a5fcf6237fe18bd23 (diff) | |
| parent | 042f763268c0f209e7c12e0a6a72bb5d204dfe29 (diff) | |
| download | mariadb-git-e3d89652e5fd314f03875a3d026490452b2a5986.tar.gz | |
Merge branch '10.0' into 10.1
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 3f174029d48..7f7407fc2dc 100644 --- a/sql/filesort.cc +++ b/sql/filesort.cc @@ -998,7 +998,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) { |