diff options
| author | unknown <monty@bitch.mysql.fi> | 2001-09-28 20:11:14 +0300 |
|---|---|---|
| committer | unknown <monty@bitch.mysql.fi> | 2001-09-28 20:11:14 +0300 |
| commit | 83d693c9d7703c78c78340f185f5403911ff95fb (patch) | |
| tree | 3e13d4009f83181fcd01ae19f10e212ffc47dd18 /mysys | |
| parent | 97743792973f4d289b4185ad68f7ee08fafa7613 (diff) | |
| parent | b9f6ef0a9268d433b4216b3f7c0c7b9323a82f71 (diff) | |
| download | mariadb-git-83d693c9d7703c78c78340f185f5403911ff95fb.tar.gz | |
Merge hundin:/my/mysql-4.0 into bitch.mysql.fi:/my/mysql-4.0
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/charset.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/charset.c b/mysys/charset.c index 1bbf7e58c77..ddabb22539e 100644 --- a/mysys/charset.c +++ b/mysys/charset.c @@ -267,7 +267,7 @@ uint get_charset_number(const char *charset_name) const char *get_charset_name(uint charset_number) { - char *name=compiled_charset_name(charset_number); + const char *name=compiled_charset_name(charset_number); if (*name != '?') return name; if (init_available_charsets(MYF(0))) /* If it isn't initialized */ |