diff options
| author | gkodinov@dl145s.mysql.com <> | 2006-09-28 10:41:42 +0200 |
|---|---|---|
| committer | gkodinov@dl145s.mysql.com <> | 2006-09-28 10:41:42 +0200 |
| commit | 3abb6043337598a94eccbf201dde11962dbfe9d5 (patch) | |
| tree | fc95e09291601cd111848ccebbb5f4cc381fc920 /sql/filesort.cc | |
| parent | 5e2f69d1ddda97c2de3d4c9cb52282e81cb518c1 (diff) | |
| parent | 4dcac0ff19e72b1f39a6d11c196504438472b2ff (diff) | |
| download | mariadb-git-3abb6043337598a94eccbf201dde11962dbfe9d5.tar.gz | |
Merge dl145s.mysql.com:/data/bk/team_tree_merge/mysql-5.1
into dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1-opt
Diffstat (limited to 'sql/filesort.cc')
| -rw-r--r-- | sql/filesort.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/filesort.cc b/sql/filesort.cc index eb2960a0458..01f3bb97557 100644 --- a/sql/filesort.cc +++ b/sql/filesort.cc @@ -1345,6 +1345,7 @@ sortlength(THD *thd, SORT_FIELD *sortorder, uint s_length, switch ((sortorder->result_type=sortorder->item->result_type())) { case STRING_RESULT: sortorder->length=sortorder->item->max_length; + set_if_smaller(sortorder->length, thd->variables.max_sort_length); if (use_strnxfrm((cs=sortorder->item->collation.collation))) { sortorder->length= cs->coll->strnxfrmlen(cs, sortorder->length); |