diff options
| author | unknown <mskold@mysql.com> | 2005-02-01 10:05:22 +0100 |
|---|---|---|
| committer | unknown <mskold@mysql.com> | 2005-02-01 10:05:22 +0100 |
| commit | af97b55308ee07b82837fa3e91b8ddb7f5e32d0a (patch) | |
| tree | 3305456120aff67a778b05a18de2a8aff865176e /sql/filesort.cc | |
| parent | fcbfb2971c6b0b1ba86809b10ad6f5740aea0c64 (diff) | |
| parent | cdce11a32b3f7801e942bd14b29f233008e335b9 (diff) | |
| download | mariadb-git-af97b55308ee07b82837fa3e91b8ddb7f5e32d0a.tar.gz | |
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
sql/filesort.cc:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'sql/filesort.cc')
| -rw-r--r-- | sql/filesort.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/filesort.cc b/sql/filesort.cc index 21f75fa5ea0..c4dbb82d8a5 100644 --- a/sql/filesort.cc +++ b/sql/filesort.cc @@ -1184,7 +1184,7 @@ sortlength(SORT_FIELD *sortorder, uint s_length, bool *multi_byte_charset) { sortorder->need_strxnfrm= 1; *multi_byte_charset= 1; - sortorder->length= sortorder->length*cs->strxfrm_multiply; + sortorder->length= cs->coll->strnxfrmlen(cs, sortorder->length); } } if (sortorder->field->maybe_null()) @@ -1197,7 +1197,7 @@ sortlength(SORT_FIELD *sortorder, uint s_length, bool *multi_byte_charset) sortorder->length=sortorder->item->max_length; if (use_strnxfrm((cs=sortorder->item->collation.collation))) { - sortorder->length= sortorder->length*cs->strxfrm_multiply; + sortorder->length= cs->coll->strnxfrmlen(cs, sortorder->length); sortorder->need_strxnfrm= 1; *multi_byte_charset= 1; } |