Merged from main 5.1

2 files changed, 4 insertions, 4 deletions

diff --git a/mysys/hash.c b/mysys/hash.c
index b4f9ba96b09..698c2299f4d 100644
--- a/mysys/hash.c
+++ b/mysys/hash.c
@@ -317,7 +317,7 @@ my_bool my_hash_insert(HASH *info,const uchar *record)
 
   if (HASH_UNIQUE & info->flags)
   {
-    byte *key= (byte*) hash_key(info, record, &idx, 1);
+    char *key= (char*) hash_key(info, record, &idx, 1);
     if (hash_search(info, key, idx))
       return(TRUE);				/* Duplicate entry */
   }
@@ -542,7 +542,7 @@ my_bool hash_update(HASH *hash, uchar *record, uchar *old_key,
   if (HASH_UNIQUE & hash->flags)
   {
     HASH_SEARCH_STATE state;
-    byte *found, *new_key= hash_key(hash, record, &idx, 1);
+    char *found, *new_key= hash_key(hash, record, &idx, 1);
     if ((found= hash_first(hash, new_key, idx, &state)))
       do 
       {
diff --git a/mysys/typelib.c b/mysys/typelib.c
index 817145bbaee..e745a9fb917 100644
--- a/mysys/typelib.c
+++ b/mysys/typelib.c
@@ -163,11 +163,11 @@ const char *get_type(TYPELIB *typelib, uint nr)
     a integer representation of the supplied string
 */
 
-my_ulonglong find_typeset(my_string x, TYPELIB *lib, int *err)
+my_ulonglong find_typeset(char *x, TYPELIB *lib, int *err)
 {
   my_ulonglong result;
   int find;
-  my_string i;
+  char *i;
   DBUG_ENTER("find_set");
   DBUG_PRINT("enter",("x: '%s'  lib: 0x%lx", x, (long) lib));