Restore previous used client charset in mysql_reconnect

Moved mysql_set_character_set function to client.c
Changed function prototype for mysql_set_character_set (as suggested
by Konstantin)


include/mysql.h:
  Changed function prototype
libmysql/libmysql.c:
  moved mysql_set_character_set to client.c
sql-common/client.c:
  moved mysql_set_character_set to client.c

1 files changed, 0 insertions, 33 deletions

diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c
index 097983cbbd3..f9ddf7fa665 100644
--- a/libmysql/libmysql.c
+++ b/libmysql/libmysql.c
@@ -1511,39 +1511,6 @@ void STDCALL mysql_get_character_set_info(MYSQL *mysql, MY_CHARSET_INFO *csinfo)
     csinfo->dir = charsets_dir;
 }
 
-int STDCALL mysql_set_character_set(MYSQL *mysql, char *cs_name)
-{
-  struct charset_info_st *cs;
-  const char *save_csdir= charsets_dir;
-
-  if (mysql->options.charset_dir)
-    charsets_dir= mysql->options.charset_dir;
-
-  if ((cs= get_charset_by_csname(cs_name, MY_CS_PRIMARY, MYF(0))))
-  {
-    char buff[MY_CS_NAME_SIZE + 10];
-    charsets_dir= save_csdir;
-    sprintf(buff, "SET NAMES %s", cs_name);
-    if (!mysql_query(mysql, buff))
-    {
-      mysql->charset= cs;
-    }
-  }
-  else
-  {
-    char cs_dir_name[FN_REFLEN];
-    get_charsets_dir(cs_dir_name);
-    mysql->net.last_errno= CR_CANT_READ_CHARSET;
-    strmov(mysql->net.sqlstate, unknown_sqlstate);
-    my_snprintf(mysql->net.last_error, sizeof(mysql->net.last_error) - 1,
-		ER(mysql->net.last_errno), cs_name, cs_dir_name);
-
-  }
-  charsets_dir= save_csdir;
-  return mysql->net.last_errno;
-}
-
-
 uint STDCALL mysql_thread_safe(void)
 {
 #ifdef THREAD