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

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;