Commit 15f33137 authored by unknown's avatar unknown

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.
parents ab91b0e4 b83b120f
...@@ -132,9 +132,9 @@ void key_copy(byte *to_key, byte *from_record, KEY *key_info, uint key_length) ...@@ -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); length= min(key_length, key_part->length);
Field *field= key_part->field; Field *field= key_part->field;
CHARSET_INFO *cs= field->charset(); 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) 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; to_key+= length;
key_length-= length; key_length-= length;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment