diff options
| author | unknown <bar@bar.mysql.r18.ru> | 2002-12-19 15:27:46 +0400 |
|---|---|---|
| committer | unknown <bar@bar.mysql.r18.ru> | 2002-12-19 15:27:46 +0400 |
| commit | d19ba004e45cb33f5dce8182b633a54af3b9c4c3 (patch) | |
| tree | c3e6bd23507975df60294ce53fadcc33d3a0b554 /sql/opt_range.cc | |
| parent | ef9c22611960eb3e7ebf1d0e4a53f47e3ef62480 (diff) | |
| download | mariadb-git-d19ba004e45cb33f5dce8182b633a54af3b9c4c3.tar.gz | |
Less "default_charset_info"
Diffstat (limited to 'sql/opt_range.cc')
| -rw-r--r-- | sql/opt_range.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/opt_range.cc b/sql/opt_range.cc index bcea522cb6d..fd1a56fc97a 100644 --- a/sql/opt_range.cc +++ b/sql/opt_range.cc @@ -1043,7 +1043,7 @@ get_mm_leaf(PARAM *param, Field *field, KEY_PART *key_part, if (maybe_null) *str= (char) field->is_real_null(); // Set to 1 if null field->get_key_image(str+maybe_null,key_part->part_length, - key_part->image_type); + field->charset(),key_part->image_type); if (!(tree=new SEL_ARG(field,str,str))) DBUG_RETURN(0); @@ -2813,7 +2813,8 @@ print_key(KEY_PART *key_part,const char *key,uint used_length) } field->set_key_image((char*) key,key_part->part_length - ((field->type() == FIELD_TYPE_BLOB) ? - HA_KEY_BLOB_LENGTH : 0)); + HA_KEY_BLOB_LENGTH : 0), + field->charset()); field->val_str(&tmp,&tmp); fwrite(tmp.ptr(),sizeof(char),tmp.length(),DBUG_FILE); } |