set_default_charset() is not used anymore

Some system_charset_info were removed


BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

3 files changed, 6 insertions, 41 deletions

diff --git a/mysys/charset.c b/mysys/charset.c
index 3ad27469c03..7baacd613b4 100644
--- a/mysys/charset.c
+++ b/mysys/charset.c
@@ -606,24 +606,6 @@ CHARSET_INFO *get_charset(uint cs_number, myf flags)
   return cs;
 }
 
-my_bool set_default_charset(uint cs, myf flags)
-{
-  CHARSET_INFO *new_charset;
-  DBUG_ENTER("set_default_charset");
-  DBUG_PRINT("enter",("character set: %d",(int) cs));
-
-  new_charset= get_charset(cs, flags);
-  if (!new_charset)
-  {
-    DBUG_PRINT("error",("Couldn't set default character set"));
-    DBUG_RETURN(TRUE);   /* error */
-  }
-  default_charset_info= new_charset;
-  system_charset_info= new_charset;
-
-  DBUG_RETURN(FALSE);
-}
-
 CHARSET_INFO *get_charset_by_name(const char *cs_name, myf flags)
 {
   uint cs_number;
@@ -673,25 +655,6 @@ CHARSET_INFO *get_charset_by_csname(const char *cs_name,
 }
 
 
-my_bool set_default_charset_by_name(const char *cs_name, myf flags)
-{
-  CHARSET_INFO *new_charset;
-  DBUG_ENTER("set_default_charset_by_name");
-  DBUG_PRINT("enter",("character set: %s", cs_name));
-
-  new_charset= get_charset_by_name(cs_name, flags);
-  if (!new_charset)
-  {
-    DBUG_PRINT("error",("Couldn't set default character set"));
-    DBUG_RETURN(TRUE);   /* error */
-  }
-
-  default_charset_info= new_charset;
-  system_charset_info= new_charset;
-  DBUG_RETURN(FALSE);
-}
-
-
 /* Only append name if it doesn't exist from before */
 
 static my_bool charset_in_string(const char *name, DYNAMIC_STRING *s)
diff --git a/mysys/charset2html.c b/mysys/charset2html.c
index 0d6450a8116..3da24232ad4 100644
--- a/mysys/charset2html.c
+++ b/mysys/charset2html.c
@@ -108,6 +108,7 @@ static void print_cs(CHARSET_INFO *cs)
 int main(int argc, char **argv) {
   const char *the_set = MYSQL_CHARSET;
   int argcnt = 1;
+  CHARSET_INFO *cs;
 
   my_init();
 
@@ -120,10 +121,10 @@ int main(int argc, char **argv) {
   if (argc > argcnt)
     charsets_dir = argv[argcnt++];
 
-  if (set_default_charset_by_name(the_set, MYF(MY_WME)))
+  if (!(cs= get_charset_by_name(the_set, MYF(MY_WME))))
     return 1;
 
-  print_cs(default_charset_info);
+  print_cs(cs);
 
   return 0;
 }
diff --git a/mysys/test_charset.c b/mysys/test_charset.c
index d031007a1da..6b0f728593a 100644
--- a/mysys/test_charset.c
+++ b/mysys/test_charset.c
@@ -58,6 +58,7 @@ int main(int argc, char **argv) {
   const char *the_set = MYSQL_CHARSET;
   char *cs_list;
   int argcnt = 1;
+  CHARSET_INFO *cs;
 
   my_init();
 
@@ -70,11 +71,11 @@ int main(int argc, char **argv) {
   if (argc > argcnt)
     charsets_dir = argv[argcnt++];
 
-  if (set_default_charset_by_name(the_set, MYF(MY_WME)))
+  if (!(cs= get_charset_by_name(the_set, MYF(MY_WME))))
     return 1;
 
   puts("CHARSET INFO:");
-  _print_csinfo(default_charset_info);
+  _print_csinfo(cs);
   fflush(stdout);
 
   cs_list = list_charsets(MYF(MY_CS_COMPILED | MY_CS_CONFIG));