1 files changed, 16 insertions, 17 deletions

diff --git a/ext/mysql/libmysql/charset.c b/ext/mysql/libmysql/charset.c
index a6b4db893a..29df5c5bdf 100644
--- a/ext/mysql/libmysql/charset.c
+++ b/ext/mysql/libmysql/charset.c
@@ -289,8 +289,7 @@ static CHARSET_INFO *find_charset_by_name(CHARSET_INFO **table, const char *name
   return NULL;
 }
 
-static CHARSET_INFO *add_charset(uint cs_number, const char *cs_name,
-                                 myf flags)
+static CHARSET_INFO *add_charset(uint cs_number, const char *cs_name)
 {
   CHARSET_INFO tmp_cs,*cs;
   uchar tmp_ctype[CTYPE_TABLE_SIZE];
@@ -305,7 +304,7 @@ static CHARSET_INFO *add_charset(uint cs_number, const char *cs_name,
   cs->to_lower=tmp_to_lower;
   cs->to_upper=tmp_to_upper;
   cs->sort_order=tmp_sort_order;
-  if (read_charset_file(cs_number, cs, flags))
+  if (read_charset_file(cs_number, cs, MYF(MY_WME)))
     return NULL;
 
   cs           = (CHARSET_INFO*) my_once_alloc(sizeof(CHARSET_INFO),
@@ -327,7 +326,7 @@ static CHARSET_INFO *add_charset(uint cs_number, const char *cs_name,
   return cs;
 }
 
-static CHARSET_INFO *get_internal_charset(uint cs_number, myf flags)
+static CHARSET_INFO *get_internal_charset(uint cs_number)
 {
   CHARSET_INFO *cs;
   /*
@@ -338,13 +337,13 @@ static CHARSET_INFO *get_internal_charset(uint cs_number, myf flags)
   if (!(cs = find_charset((CHARSET_INFO**) cs_info_table.buffer, cs_number,
 			  cs_info_table.elements)))
     if (!(cs = find_compiled_charset(cs_number)))
-      cs=add_charset(cs_number, get_charset_name(cs_number), flags);
+      cs=add_charset(cs_number, get_charset_name(cs_number));
   pthread_mutex_unlock(&THR_LOCK_charset);
   return cs;
 }
 
 
-static CHARSET_INFO *get_internal_charset_by_name(const char *name, myf flags)
+static CHARSET_INFO *get_internal_charset_by_name(const char *name)
 {
   CHARSET_INFO *cs;
   /*
@@ -355,7 +354,7 @@ static CHARSET_INFO *get_internal_charset_by_name(const char *name, myf flags)
   if (!(cs = find_charset_by_name((CHARSET_INFO**) cs_info_table.buffer, name,
 				 cs_info_table.elements)))
     if (!(cs = find_compiled_charset_by_name(name)))
-      cs=add_charset(get_charset_number(name), name, flags);
+      cs=add_charset(get_charset_number(name), name);
   pthread_mutex_unlock(&THR_LOCK_charset);
   return cs;
 }
@@ -365,7 +364,7 @@ CHARSET_INFO *get_charset(uint cs_number, myf flags)
 {
   CHARSET_INFO *cs;
   (void) init_available_charsets(MYF(0));	/* If it isn't initialized */
-  cs=get_internal_charset(cs_number, flags);
+  cs=get_internal_charset(cs_number);
 
   if (!cs && (flags & MY_WME))
   {
@@ -380,16 +379,16 @@ CHARSET_INFO *get_charset(uint cs_number, myf flags)
 
 my_bool set_default_charset(uint cs, myf flags)
 {
-  CHARSET_INFO *new;
+  CHARSET_INFO *new_charset;
   DBUG_ENTER("set_default_charset");
   DBUG_PRINT("enter",("character set: %d",(int) cs));
-  new = get_charset(cs, flags);
-  if (!new)
+  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;
+  default_charset_info = new_charset;
   DBUG_RETURN(FALSE);
 }
 
@@ -397,7 +396,7 @@ CHARSET_INFO *get_charset_by_name(const char *cs_name, myf flags)
 {
   CHARSET_INFO *cs;
   (void) init_available_charsets(MYF(0));	/* If it isn't initialized */
-  cs=get_internal_charset_by_name(cs_name, flags);
+  cs=get_internal_charset_by_name(cs_name);
 
   if (!cs && (flags & MY_WME))
   {
@@ -411,17 +410,17 @@ CHARSET_INFO *get_charset_by_name(const char *cs_name, myf flags)
 
 my_bool set_default_charset_by_name(const char *cs_name, myf flags)
 {
-  CHARSET_INFO *new;
+  CHARSET_INFO *new_charset;
   DBUG_ENTER("set_default_charset_by_name");
   DBUG_PRINT("enter",("character set: %s", cs_name));
-  new = get_charset_by_name(cs_name, flags);
-  if (!new)
+  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;
+  default_charset_info = new_charset;
   DBUG_RETURN(FALSE);
 }