diff --git a/sql/sql_db.cc b/sql/sql_db.cc
index 517438d9203..99763d717fe 100644
--- a/sql/sql_db.cc
+++ b/sql/sql_db.cc
@@ -108,7 +108,7 @@ static bool load_db_opt(const char *path, HA_CREATE_INFO *create)
     {
       char *pos= buf+nbytes-1;
       /* Remove end space and control characters */
-      while (pos > buf && !my_isgraph(system_charset_info, pos[-1]))
+      while (pos > buf && !my_isgraph(&my_charset_latin1, pos[-1]))
 	pos--;
       *pos=0;
       if ((pos= strchr(buf, '=')))
@@ -414,8 +414,8 @@ static long mysql_rm_known_files(THD *thd, MY_DIR *dirp, const char *db,
     DBUG_PRINT("info",("Examining: %s", file->name));
 
     /* Check if file is a raid directory */
-    if (my_isdigit(system_charset_info,file->name[0]) && 
-        my_isdigit(system_charset_info,file->name[1]) &&
+    if (my_isdigit(&my_charset_latin1,file->name[0]) && 
+        my_isdigit(&my_charset_latin1,file->name[1]) &&
 	!file->name[2] && !level)
     {
       char newpath[FN_REFLEN];
@@ -440,7 +440,7 @@ static long mysql_rm_known_files(THD *thd, MY_DIR *dirp, const char *db,
       continue;
     }
     strxmov(filePath,org_path,"/",file->name,NullS);
-    if (db && !my_strcasecmp(system_charset_info, 
+    if (db && !my_strcasecmp(&my_charset_latin1, 
                              fn_ext(file->name), reg_ext))
     {
       /* Drop the table nicely */
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index a3b8ccafc11..bdbec6bc76f 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -912,7 +912,7 @@ extern "C" pthread_handler_decl(handle_bootstrap,arg)
   while (fgets(buff, thd->net.max_packet, file))
   {
     uint length=(uint) strlen(buff);
-    while (length && (my_isspace(system_charset_info, buff[length-1]) ||
+    while (length && (my_isspace(thd->charset(), buff[length-1]) ||
            buff[length-1] == ';'))
       length--;
     buff[length]=0;
@@ -1265,7 +1265,7 @@ restore_user:
       ulong length= thd->query_length-(ulong)(thd->lex.found_colon-thd->query);
       
       /* Remove garbage at start of query */
-      while (my_isspace(system_charset_info, *packet) && length > 0)
+      while (my_isspace(thd->charset(), *packet) && length > 0)
       {
         packet++;
         length--;
@@ -1539,14 +1539,14 @@ bool alloc_query(THD *thd, char *packet, ulong packet_length)
 {
   packet_length--;				// Remove end null
   /* Remove garbage at start and end of query */
-  while (my_isspace(system_charset_info,packet[0]) && packet_length > 0)
+  while (my_isspace(thd->charset(),packet[0]) && packet_length > 0)
   {
     packet++;
     packet_length--;
   }
   char *pos=packet+packet_length;		// Point at end null
   while (packet_length > 0 &&
-	 (pos[-1] == ';' || my_isspace(system_charset_info,pos[-1])))
+	 (pos[-1] == ';' || my_isspace(thd->charset() ,pos[-1])))
   {
     pos--;
     packet_length--;