diff options
| author | monty@hundin.mysql.fi <> | 2001-08-22 01:45:07 +0300 |
|---|---|---|
| committer | monty@hundin.mysql.fi <> | 2001-08-22 01:45:07 +0300 |
| commit | 733f865f54e297bf512f10ec0631342303164b25 (patch) | |
| tree | 32f2629127dea884d1930817179e72d2076be756 /mysys/charset.c | |
| parent | 063a1a6557ad2c501f4da9a47e633fb191ee2e00 (diff) | |
| download | mariadb-git-733f865f54e297bf512f10ec0631342303164b25.tar.gz | |
Fixes for OS2.
Fix bug in isamlog
Add argument types to function declarations.
Diffstat (limited to 'mysys/charset.c')
| -rw-r--r-- | mysys/charset.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/mysys/charset.c b/mysys/charset.c index c17c6113b57..f778afb4144 100644 --- a/mysys/charset.c +++ b/mysys/charset.c @@ -393,16 +393,16 @@ CHARSET_INFO *get_charset(uint cs_number, myf flags) my_bool set_default_charset(uint cs, myf flags) { - CHARSET_INFO *new; + CHARSET_INFO *new_charset; DBUG_ENTER("set_default_charset"); DBUG_PRINT("enter",("character set: %d",(int) cs)); - new = get_charset(cs, flags); - if (!new) + new_charset = get_charset(cs, flags); + if (!new_charset) { DBUG_PRINT("error",("Couldn't set default character set")); DBUG_RETURN(TRUE); /* error */ } - default_charset_info = new; + default_charset_info = new_charset; DBUG_RETURN(FALSE); } @@ -424,17 +424,17 @@ CHARSET_INFO *get_charset_by_name(const char *cs_name, myf flags) my_bool set_default_charset_by_name(const char *cs_name, myf flags) { - CHARSET_INFO *new; + CHARSET_INFO *new_charset; DBUG_ENTER("set_default_charset_by_name"); DBUG_PRINT("enter",("character set: %s", cs_name)); - new = get_charset_by_name(cs_name, flags); - if (!new) + new_charset = get_charset_by_name(cs_name, flags); + if (!new_charset) { DBUG_PRINT("error",("Couldn't set default character set")); DBUG_RETURN(TRUE); /* error */ } - default_charset_info = new; + default_charset_info = new_charset; DBUG_RETURN(FALSE); } |