diff --git a/client/mysql.cc b/client/mysql.cc
index 155d8b03231..f421756f0b4 100644
--- a/client/mysql.cc
+++ b/client/mysql.cc
@@ -809,7 +809,8 @@ static int get_options(int argc, char **argv)
     opt_reconnect= 0;
     connect_flag= 0; /* Not in interactive mode */
   }
-  if (!(charset_info= get_charset_by_name(default_charset, MYF(MY_WME))))
+  if (!(charset_info= get_charset_by_csname(default_charset, 
+					    MY_CS_PRIMARY, MYF(MY_WME))))
     exit(1);
   if (argc > 1)
   {
diff --git a/client/mysqlcheck.c b/client/mysqlcheck.c
index cd8cd0ef82e..8f599c9f497 100644
--- a/client/mysqlcheck.c
+++ b/client/mysqlcheck.c
@@ -308,7 +308,8 @@ static int get_options(int *argc, char ***argv)
     else
       what_to_do = DO_CHECK;
   }
-  if (!(charset_info= get_charset_by_name(default_charset, MYF(MY_WME))))
+  if (!(charset_info= get_charset_by_csname(default_charset, 
+  					    MY_CS_PRIMARY, MYF(MY_WME))))
       exit(1);
   if (*argc > 0 && opt_alldbs)
   {
diff --git a/client/mysqldump.c b/client/mysqldump.c
index 17780458a2a..6a577af8792 100644
--- a/client/mysqldump.c
+++ b/client/mysqldump.c
@@ -492,7 +492,8 @@ static int get_options(int *argc, char ***argv)
 	    my_progname);
     return(1);
   }
-  if (!(charset_info= get_charset_by_name(default_charset, MYF(MY_WME))))
+  if (!(charset_info= get_charset_by_csname(default_charset, 
+  					    MY_CS_PRIMARY, MYF(MY_WME))))
     exit(1);
   if ((*argc < 1 && !opt_alldbs) || (*argc > 0 && opt_alldbs))
   {
diff --git a/client/mysqlimport.c b/client/mysqlimport.c
index efb117280c4..f247301c6dc 100644
--- a/client/mysqlimport.c
+++ b/client/mysqlimport.c
@@ -239,7 +239,8 @@ static int get_options(int *argc, char ***argv)
     fprintf(stderr, "You can't use --ignore (-i) and --replace (-r) at the same time.\n");
     return(1);
   }
-  if (!(charset_info= get_charset_by_name(default_charset, MYF(MY_WME))))
+  if (!(charset_info= get_charset_by_csname(default_charset,
+  					    MY_CS_PRIMARY, MYF(MY_WME))))
     exit(1);
   if (*argc < 2)
   {