diff options
| author | unknown <root@home.(none)> | 2003-03-16 12:30:10 +0400 |
|---|---|---|
| committer | unknown <root@home.(none)> | 2003-03-16 12:30:10 +0400 |
| commit | 23f252855e5dcb18ac55cf9ce303f61c28e06421 (patch) | |
| tree | dba5acdcfade3de03935aa1867550c60b1e85696 /mysys/default.c | |
| parent | 2aa9f207358c2c82c63e4e5ac6f952dbf6aeddec (diff) | |
| download | mariadb-git-23f252855e5dcb18ac55cf9ce303f61c28e06421.tar.gz | |
system_charset_info has been moved to /sql directory
and isn't used in libraries any longer
Diffstat (limited to 'mysys/default.c')
| -rw-r--r-- | mysys/default.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mysys/default.c b/mysys/default.c index 06557f73d06..0ae409f1015 100644 --- a/mysys/default.c +++ b/mysys/default.c @@ -249,7 +249,7 @@ static my_bool search_default_file(DYNAMIC_ARRAY *args, MEM_ROOT *alloc, { line++; /* Ignore comment and empty lines */ - for (ptr=buff ; my_isspace(system_charset_info,*ptr) ; ptr++ ) ; + for (ptr=buff ; my_isspace(&my_charset_latin1,*ptr) ; ptr++ ) ; if (*ptr == '#' || *ptr == ';' || !*ptr) continue; if (*ptr == '[') /* Group name */ @@ -262,7 +262,7 @@ static my_bool search_default_file(DYNAMIC_ARRAY *args, MEM_ROOT *alloc, name,line); goto err; } - for ( ; my_isspace(system_charset_info,end[-1]) ; end--) ;/* Remove end space */ + for ( ; my_isspace(&my_charset_latin1,end[-1]) ; end--) ;/* Remove end space */ end[0]=0; read_values=find_type(ptr,group,3) > 0; continue; @@ -278,7 +278,7 @@ static my_bool search_default_file(DYNAMIC_ARRAY *args, MEM_ROOT *alloc, continue; if (!(end=value=strchr(ptr,'='))) end=strend(ptr); /* Option without argument */ - for ( ; my_isspace(system_charset_info,end[-1]) ; end--) ; + for ( ; my_isspace(&my_charset_latin1,end[-1]) ; end--) ; if (!value) { if (!(tmp=alloc_root(alloc,(uint) (end-ptr)+3))) @@ -291,9 +291,9 @@ static my_bool search_default_file(DYNAMIC_ARRAY *args, MEM_ROOT *alloc, { /* Remove pre- and end space */ char *value_end; - for (value++ ; my_isspace(system_charset_info,*value); value++) ; + for (value++ ; my_isspace(&my_charset_latin1,*value); value++) ; value_end=strend(value); - for ( ; my_isspace(system_charset_info,value_end[-1]) ; value_end--) ; + for ( ; my_isspace(&my_charset_latin1,value_end[-1]) ; value_end--) ; if (value_end < value) /* Empty string */ value_end=value; if (!(tmp=alloc_root(alloc,(uint) (end-ptr)+3 + |