diff options
| author | bar@bar.mysql.r18.ru <> | 2002-10-25 13:58:32 +0500 |
|---|---|---|
| committer | bar@bar.mysql.r18.ru <> | 2002-10-25 13:58:32 +0500 |
| commit | 95aef915216391d2c23cec856d08a49aede76635 (patch) | |
| tree | d8d121f81f5cf89edfe070e49636482fd879f1fa /sql/filesort.cc | |
| parent | 0ca3212a8cc3bafab07556e5dab2294fce17258a (diff) | |
| download | mariadb-git-95aef915216391d2c23cec856d08a49aede76635.tar.gz | |
BINARY charset is now used instead of binary_flag
Diffstat (limited to 'sql/filesort.cc')
| -rw-r--r-- | sql/filesort.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/filesort.cc b/sql/filesort.cc index e1c673aca0b..6fb9c699ffc 100644 --- a/sql/filesort.cc +++ b/sql/filesort.cc @@ -498,7 +498,7 @@ static void make_sortkey(register SORTPARAM *param, #ifdef USE_STRCOLL if(use_strnxfrm(cs)) { - if (item->binary) + if (item->binary()) { if (res->ptr() != (char*) to) memcpy(to,res->ptr(),length); @@ -525,7 +525,7 @@ static void make_sortkey(register SORTPARAM *param, if (res->ptr() != (char*) to) memcpy(to,res->ptr(),length); bzero((char *)to+length,diff); - if (!item->binary) + if (!item->binary()) my_tosort(cs, (char*) to,length); #ifdef USE_STRCOLL } @@ -948,7 +948,7 @@ sortlength(SORT_FIELD *sortorder, uint s_length) case STRING_RESULT: sortorder->length=sortorder->item->max_length; #ifdef USE_STRCOLL - if (!sortorder->item->binary) + if (!sortorder->item->binary()) { CHARSET_INFO *cs=sortorder->item->str_value.charset(); if (use_strnxfrm(cs)) |