diff options
| author | unknown <monty@donna.mysql.com> | 2000-10-11 01:18:03 +0300 |
|---|---|---|
| committer | unknown <monty@donna.mysql.com> | 2000-10-11 01:18:03 +0300 |
| commit | da2c52f1fe73f1fca8d95875957b4bcb4bd84a4b (patch) | |
| tree | b2c67cc4d23c305090ee2d98ec39d9ec6b034a3c /mysys/charset.c | |
| parent | e07d0930f4ecadf576c1dca76df3caab83ba04ae (diff) | |
| parent | 3b5f8e5ee4ca4f78c2701d819f41820391de8b1a (diff) | |
| download | mariadb-git-da2c52f1fe73f1fca8d95875957b4bcb4bd84a4b.tar.gz | |
merge
mysys/charset.c:
Auto merged
BitKeeper/etc/logging_ok:
Auto merged
Diffstat (limited to 'mysys/charset.c')
| -rw-r--r-- | mysys/charset.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysys/charset.c b/mysys/charset.c index 78e33be0c5f..47716540b2c 100644 --- a/mysys/charset.c +++ b/mysys/charset.c @@ -67,7 +67,7 @@ static char *name_from_csnum(CS_ID **cs, uint number) for (c = cs; *c; ++c) if ((*c)->number == number) return (*c)->name; - return "?"; /* this mimics find_type() */ + return (char*) "?"; /* this mimics find_type() */ } static my_bool get_word(struct simpleconfig_buf_st *fb, char *buf) @@ -487,7 +487,7 @@ char * list_charsets(myf want_flags) { CS_ID **c; char buf[FN_REFLEN]; - MY_STAT stat; + MY_STAT status; if((c=available_charsets)) for (; *c; ++c) @@ -495,7 +495,7 @@ char * list_charsets(myf want_flags) if (charset_in_string((*c)->name, &s)) continue; get_charset_conf_name((*c)->number, buf); - if (!my_stat(buf, &stat, MYF(0))) + if (!my_stat(buf, &status, MYF(0))) continue; /* conf file doesn't exist */ dynstr_append(&s, (*c)->name); dynstr_append(&s, " "); |