diff options
| author | mskold@mysql.com <> | 2005-01-17 09:44:34 +0100 |
|---|---|---|
| committer | mskold@mysql.com <> | 2005-01-17 09:44:34 +0100 |
| commit | 6bb027a97cbae873ad16c65dafd77dccbfee0c4e (patch) | |
| tree | bbce6ee6332b88bfdd3cded288413658c0bd922c /sql/filesort.cc | |
| parent | 74f883ad02a036061cd50b91a6ed52813e53c627 (diff) | |
| parent | b305596681cf52f96e35a051cd3cce073afeb8fb (diff) | |
| download | mariadb-git-6bb027a97cbae873ad16c65dafd77dccbfee0c4e.tar.gz | |
Merge
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 6bad5202ec6..486215e51a1 100644 --- a/sql/filesort.cc +++ b/sql/filesort.cc @@ -657,10 +657,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 { |