diff options
| author | unknown <bar@mysql.com> | 2005-01-13 18:12:04 +0400 |
|---|---|---|
| committer | unknown <bar@mysql.com> | 2005-01-13 18:12:04 +0400 |
| commit | 9842aca3ef48bf56a6c3ee5b9e1159e4249ce346 (patch) | |
| tree | 89b4be1d3a807d6f2554dce92b0a5ecd0a9009ab /sql/filesort.cc | |
| parent | bcb3783c7c88b06a8417a5734103ae856a2f7dbc (diff) | |
| download | mariadb-git-9842aca3ef48bf56a6c3ee5b9e1159e4249ce346.tar.gz | |
bug#7284: strnxfrm returns different results for equal strings
Diffstat (limited to 'sql/filesort.cc')
| -rw-r--r-- | sql/filesort.cc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sql/filesort.cc b/sql/filesort.cc index bd0de022fd4..cb377070aaa 100644 --- a/sql/filesort.cc +++ b/sql/filesort.cc @@ -622,10 +622,7 @@ static void make_sortkey(register SORTPARAM *param, } uint tmp_length=my_strnxfrm(cs,to,sort_field->length, (unsigned char *) from, length); - if (tmp_length < sort_field->length) - cs->cset->fill(cs, (char*) to+tmp_length, - sort_field->length-tmp_length, - fill_char); + DBUG_ASSERT(tmp_length == sort_field->length); } else { |