diff options
| author | unknown <gshchepa/uchum@gshchepa.loc> | 2007-04-29 12:09:08 +0500 |
|---|---|---|
| committer | unknown <gshchepa/uchum@gshchepa.loc> | 2007-04-29 12:09:08 +0500 |
| commit | a925eadc508fb798b5e7e0521118cf95f862629b (patch) | |
| tree | 26d2c30ecf4b005478fdc01c0bb767f5d3cec7fc /sql/key.cc | |
| parent | edfa3dcf71666039dea6a950e193418fb6ae5d59 (diff) | |
| parent | e8225073649844a43bc4ea6362a5df5e6210933b (diff) | |
| download | mariadb-git-a925eadc508fb798b5e7e0521118cf95f862629b.tar.gz | |
Merge gshchepa.loc:/home/uchum/work/bk-trees/mysql-4.1-opt
into gshchepa.loc:/home/uchum/work/bk-trees/mysql-5.0-opt-13191
sql/key.cc:
Patch to eliminate compilation errors under VC after bug #13191 fix.
Diffstat (limited to 'sql/key.cc')
| -rw-r--r-- | sql/key.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/key.cc b/sql/key.cc index 4c75fcae74a..1816e924c2b 100644 --- a/sql/key.cc +++ b/sql/key.cc @@ -132,9 +132,9 @@ void key_copy(byte *to_key, byte *from_record, KEY *key_info, uint key_length) length= min(key_length, key_part->length); Field *field= key_part->field; CHARSET_INFO *cs= field->charset(); - uint bytes= field->get_key_image(to_key, length, Field::itRAW); + uint bytes= field->get_key_image((char*) to_key, length, Field::itRAW); if (bytes < length) - cs->cset->fill(cs, to_key + bytes, length - bytes, ' '); + cs->cset->fill(cs, (char*) to_key + bytes, length - bytes, ' '); } to_key+= length; key_length-= length; |