Removed some default_charset_info

2 files changed, 2 insertions, 3 deletions

diff --git a/client/sql_string.cc b/client/sql_string.cc
index 62b1812afb3..cf9e9f62507 100644
--- a/client/sql_string.cc
+++ b/client/sql_string.cc
@@ -617,7 +617,7 @@ int wild_case_compare(CHARSET_INFO *cs, const char *str,const char *str_end,
 {
   int result= -1;				// Not found, using wildcards
 #ifdef USE_MB
-  bool use_mb_flag=use_mb(default_charset_info);
+  bool use_mb_flag=use_mb(cs);
 #endif
   while (wildstr != wildend)
   {
diff --git a/mysys/hash.c b/mysys/hash.c
index 41ebe59c2de..3faaff1f169 100644
--- a/mysys/hash.c
+++ b/mysys/hash.c
@@ -275,10 +275,9 @@ static int hashcmp(HASH *hash,HASH_LINK *pos,const byte *key,uint length)
 {
   uint rec_keylength;
   byte *rec_key=hash_key(hash,pos->data,&rec_keylength,1);
-  /* BAR TODO: remove default_charset_info */
   return (length && length != rec_keylength) ||
     (hash->flags & HASH_CASE_INSENSITIVE ?
-     my_strncasecmp(default_charset_info, rec_key,key,rec_keylength) :
+     my_strncasecmp(hash->charset, rec_key,key,rec_keylength) :
      memcmp(rec_key,key,rec_keylength));
 }