diff options
| author | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2010-09-02 16:57:59 +0300 |
|---|---|---|
| committer | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2010-09-02 16:57:59 +0300 |
| commit | 684c3e9e3d30a2ce5d1f7ded2df3ebc8739522de (patch) | |
| tree | 01ea2fc9c3a14de19f90bb4dfd75fff3ca16379b /sql/field.cc | |
| parent | d63b9feb103b5ebb2b4af378e1d2f420059e3e4b (diff) | |
| parent | f8f23158c7e427b10e87c117d19b3642c9753f78 (diff) | |
| download | mariadb-git-684c3e9e3d30a2ce5d1f7ded2df3ebc8739522de.tar.gz | |
merge from 5.5-merge
Diffstat (limited to 'sql/field.cc')
| -rw-r--r-- | sql/field.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/field.cc b/sql/field.cc index c9b5f980ae5..599e8349bca 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -1329,7 +1329,7 @@ void Field::hash(ulong *nr, ulong *nr2) else { uint len= pack_length(); - CHARSET_INFO *cs= charset(); + CHARSET_INFO *cs= sort_charset(); cs->coll->hash_sort(cs, ptr, len, nr, nr2); } } |