diff options
| author | bar@bar.intranet.mysql.r18.ru <> | 2004-01-12 14:31:04 +0400 |
|---|---|---|
| committer | bar@bar.intranet.mysql.r18.ru <> | 2004-01-12 14:31:04 +0400 |
| commit | 042fe0bed458393be68666d2a775bbd082705e86 (patch) | |
| tree | 1a7457276f3e91349266f71b40f0b9f575fe00d1 /mysys/charset.c | |
| parent | ecf8118cff8e25fb2286ea75a9c24f513423a2da (diff) | |
| download | mariadb-git-042fe0bed458393be68666d2a775bbd082705e86.tar.gz | |
charset.c:
Fixed: client crashed when there are no Index.xml file.
Diffstat (limited to 'mysys/charset.c')
| -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 f8c8237c88b..b911f29627c 100644 --- a/mysys/charset.c +++ b/mysys/charset.c @@ -540,7 +540,7 @@ static CHARSET_INFO *get_internal_charset(uint cs_number, myf flags) strxmov(get_charsets_dir(buf), cs->csname, ".xml", NullS); my_read_charset_file(buf,flags); } - cs= (cs->state & MY_CS_AVAILABLE) ? cs : NULL; + cs= (cs && cs->state & MY_CS_AVAILABLE) ? cs : NULL; pthread_mutex_unlock(&THR_LOCK_charset); return cs; } |