diff options
| author | df@pippilotta.erinye.com <> | 2007-08-04 11:08:11 +0200 |
|---|---|---|
| committer | df@pippilotta.erinye.com <> | 2007-08-04 11:08:11 +0200 |
| commit | f0f96529888316c7d64fb5b898081cac3c7d9eb0 (patch) | |
| tree | 57797b874ff7ad01010e719ccbb18202f1565292 /mysys/charset.c | |
| parent | 92d4958eb7b60e9767e398d5f762e4fd98cd0b04 (diff) | |
| parent | b880985ea723fa2a8e568564a38159cda5ce5277 (diff) | |
| download | mariadb-git-f0f96529888316c7d64fb5b898081cac3c7d9eb0.tar.gz | |
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
Diffstat (limited to 'mysys/charset.c')
| -rw-r--r-- | mysys/charset.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mysys/charset.c b/mysys/charset.c index a9b452b0a55..692d7867fe0 100644 --- a/mysys/charset.c +++ b/mysys/charset.c @@ -326,14 +326,14 @@ static int charset_initialized=0; static my_bool my_read_charset_file(const char *filename, myf myflags) { - char *buf; + uchar *buf; int fd; uint len, tmp_len; MY_STAT stat_info; if (!my_stat(filename, &stat_info, MYF(myflags)) || ((len= (uint)stat_info.st_size) > MY_MAX_ALLOWED_BUF) || - !(buf= (char *)my_malloc(len,myflags))) + !(buf= (uchar*) my_malloc(len,myflags))) return TRUE; if ((fd=my_open(filename,O_RDONLY,myflags)) < 0) @@ -343,7 +343,7 @@ static my_bool my_read_charset_file(const char *filename, myf myflags) if (tmp_len != len) goto error; - if (my_parse_charset_xml(buf,len,add_collation)) + if (my_parse_charset_xml((char*) buf,len,add_collation)) { #ifdef NOT_YET printf("ERROR at line %d pos %d '%s'\n", @@ -353,7 +353,7 @@ static my_bool my_read_charset_file(const char *filename, myf myflags) #endif } - my_free(buf, myflags); + my_free(buf, myflags); return FALSE; error: |