system_charset_info has been moved to /sql directory

and isn't used in libraries any longer

4 files changed, 8 insertions, 8 deletions

diff --git a/extra/mysql_install.c b/extra/mysql_install.c
index 3f3da8cfb51..11f33028ce1 100644
--- a/extra/mysql_install.c
+++ b/extra/mysql_install.c
@@ -157,7 +157,7 @@ static int get_answer(QUESTION_WIDGET* w)
     char c;
     if (!fgets(buf,sizeof(buf),w->in))
       die("Failed fgets on input stream");
-    switch ((c=my_tolower(system_charset_info,*buf)))
+    switch ((c=my_tolower(&my_charset_latin1,*buf)))
     {
     case '\n':
       return w->default_ind;
diff --git a/extra/replace.c b/extra/replace.c
index 5826586988a..8e007e3a971 100644
--- a/extra/replace.c
+++ b/extra/replace.c
@@ -113,7 +113,7 @@ char *argv[];
     exit(1);
 
   for (i=1,pos=word_end_chars ; i < 256 ; i++)
-    if (my_isspace(system_charset_info,i))
+    if (my_isspace(&my_charset_latin1,i))
       *pos++=i;
   *pos=0;
   if (!(replace=init_replace((char**) from.typelib.type_names,
diff --git a/extra/resolve_stack_dump.c b/extra/resolve_stack_dump.c
index f19ef467b5c..06a670b935d 100644
--- a/extra/resolve_stack_dump.c
+++ b/extra/resolve_stack_dump.c
@@ -175,9 +175,9 @@ trace dump and specify the path to it with -s or --symbols-file");
 static uchar hex_val(char c)
 {
   uchar l;
-  if (my_isdigit(system_charset_info,c))
+  if (my_isdigit(&my_charset_latin1,c))
     return c - '0';
-  l = my_tolower(system_charset_info,c);
+  l = my_tolower(&my_charset_latin1,c);
   if (l < 'a' || l > 'f')
     return HEX_INVALID; 
   return (uchar)10 + ((uchar)c - (uchar)'a');
@@ -203,10 +203,10 @@ static int init_sym_entry(SYM_ENTRY* se, char* buf)
 
   if (!se->addr)
     return -1;
-  while (my_isspace(system_charset_info,*buf++))
+  while (my_isspace(&my_charset_latin1,*buf++))
     /* empty */;
 
-  while (my_isspace(system_charset_info,*buf++))
+  while (my_isspace(&my_charset_latin1,*buf++))
     /* empty - skip more space */;
   --buf;
   /* now we are on the symbol */
@@ -288,7 +288,7 @@ static void do_resolve()
   {
     p = buf;
     /* skip space */
-    while (my_isspace(system_charset_info,*p))
+    while (my_isspace(&my_charset_latin1,*p))
       ++p;
 
     if (*p++ == '0' && *p++ == 'x')
diff --git a/extra/resolveip.c b/extra/resolveip.c
index c9446b0fdf2..95861bca2bc 100644
--- a/extra/resolveip.c
+++ b/extra/resolveip.c
@@ -122,7 +122,7 @@ int main(int argc, char **argv)
   {
     ip = *argv++;    
 
-    if (my_isdigit(system_charset_info,ip[0]))
+    if (my_isdigit(&my_charset_latin1,ip[0]))
     {
       taddr = inet_addr(ip);
       if (taddr == htonl(INADDR_BROADCAST))