diff options
| author | unknown <monty@mysql.com> | 2005-02-28 12:00:18 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2005-02-28 12:00:18 +0200 |
| commit | 8e3addf9284742a6b29fb3016b8c612dfd1a5778 (patch) | |
| tree | e5276b2dcc2d97dc099d779c4b4f0c4eb1fd227d /sql/filesort.cc | |
| parent | 46a8c5221750f4f0b5baf870d4f131d8f3de2821 (diff) | |
| parent | 8b8c9452ddc734c42301f64e625c31779968232a (diff) | |
| download | mariadb-git-8e3addf9284742a6b29fb3016b8c612dfd1a5778.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
BitKeeper/etc/ignore:
added support-files/ndb-config-2-node.ini
Diffstat (limited to 'sql/filesort.cc')
| -rw-r--r-- | sql/filesort.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/filesort.cc b/sql/filesort.cc index 24088210f1a..76ce9ac4ce2 100644 --- a/sql/filesort.cc +++ b/sql/filesort.cc @@ -1127,7 +1127,7 @@ sortlength(SORT_FIELD *sortorder, uint s_length, bool *multi_byte_charset) else { sortorder->length=sortorder->field->pack_length(); - if (use_strnxfrm((cs=sortorder->field->charset()))) + if (use_strnxfrm((cs=sortorder->field->sort_charset()))) { sortorder->need_strxnfrm= 1; *multi_byte_charset= 1; |