Move latin1 into a separarte file

1 files changed, 6 insertions, 6 deletions

diff --git a/sql/sql_string.cc b/sql/sql_string.cc
index 654076c3f41..ce1b469bf5e 100644
--- a/sql/sql_string.cc
+++ b/sql/sql_string.cc
@@ -124,14 +124,14 @@ bool String::set(double num,uint decimals, CHARSET_INFO *cs)
   if (decimals >= NOT_FIXED_DEC)
   {
     sprintf(buff,"%.14g",num);			// Enough for a DATETIME
-    return copy(buff, (uint32) strlen(buff), my_charset_latin1, cs);
+    return copy(buff, (uint32) strlen(buff), &my_charset_latin1, cs);
   }
 #ifdef HAVE_FCONVERT
   int decpt,sign;
   char *pos,*to;
 
   VOID(fconvert(num,(int) decimals,&decpt,&sign,buff+1));
-  if (!my_isdigit(my_charset_latin1, buff[1]))
+  if (!my_isdigit(&my_charset_latin1, buff[1]))
   {						// Nan or Inf
     pos=buff+1;
     if (sign)
@@ -139,7 +139,7 @@ bool String::set(double num,uint decimals, CHARSET_INFO *cs)
       buff[0]='-';
       pos=buff;
     }
-    return copy(pos,(uint32) strlen(pos), my_charset_latin1, cs);
+    return copy(pos,(uint32) strlen(pos), &my_charset_latin1, cs);
   }
   if (alloc((uint32) ((uint32) decpt+3+decimals)))
     return TRUE;
@@ -189,7 +189,7 @@ end:
 #else
   sprintf(buff,"%.*f",(int) decimals,num);
 #endif
-  return copy(buff,(uint32) strlen(buff), my_charset_latin1, cs);
+  return copy(buff,(uint32) strlen(buff), &my_charset_latin1, cs);
 #endif
 }
 
@@ -267,7 +267,7 @@ bool String::set_latin1(const char *str, uint32 arg_length)
     set(str, arg_length, str_charset);
     return 0;
   }
-  return copy(str, arg_length, my_charset_latin1, str_charset);
+  return copy(str, arg_length, &my_charset_latin1, str_charset);
 }
 
 
@@ -322,7 +322,7 @@ bool String::append(const char *s,uint32 arg_length)
     if (realloc(str_length+ add_length))
       return TRUE;
     str_length+= copy_and_convert(Ptr+str_length, add_length, str_charset,
-				  s, arg_length, my_charset_latin1);
+				  s, arg_length, &my_charset_latin1);
     return FALSE;
   }
   if (realloc(str_length+arg_length))