bk commit into 5.0 tree (gshchepa:1.2448)

[<gshchepa]

Below is the list of changes that have just been committed into a local
5.0 repository of uchum. When uchum does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-04-29 12:09:08+05:00, gshchepa@stripped +1 -0
  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
  MERGE: 1.1616.3016.7

  sql/key.cc@stripped, 2007-04-29 12:08:25+05:00, gshchepa@stripped +2 -4
    Patch to eliminate compilation errors under VC after bug #13191 fix.
    MERGE: 1.25.1.3

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	gshchepa
# Host:	gshchepa.loc
# Root:	/home/uchum/work/bk-trees/mysql-5.0-opt-13191/RESYNC

--- 1.40/sql/key.cc	2007-04-29 08:51:41 +05:00
+++ 1.41/sql/key.cc	2007-04-29 12:08:25 +05:00
@@ -132,9 +132,9 @@ void key_copy(byte *to_key, byte *from_r
       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;