diff options
| author | Bjorn Munch <Bjorn.Munch@sun.com> | 2009-10-18 10:08:07 +0200 |
|---|---|---|
| committer | Bjorn Munch <Bjorn.Munch@sun.com> | 2009-10-18 10:08:07 +0200 |
| commit | cf7afa11640cd09f24dd54f5a8b4be9d66f59da2 (patch) | |
| tree | d84d583064aeef675b4cebfdc39150e957415d17 /strings/conf_to_src.c | |
| parent | cecb2ce97bed24341189edee0619528264114f8f (diff) | |
| parent | 4def52165d3724080793a752f244e56aea3aecc0 (diff) | |
| download | mariadb-git-cf7afa11640cd09f24dd54f5a8b4be9d66f59da2.tar.gz | |
merge from next-mr
Diffstat (limited to 'strings/conf_to_src.c')
| -rw-r--r-- | strings/conf_to_src.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/strings/conf_to_src.c b/strings/conf_to_src.c index 7e742050aa8..9f1ed9b2441 100644 --- a/strings/conf_to_src.c +++ b/strings/conf_to_src.c @@ -184,11 +184,12 @@ void dispcset(FILE *f,CHARSET_INFO *cs) { fprintf(f,"{\n"); fprintf(f," %d,%d,%d,\n",cs->number,0,0); - fprintf(f," MY_CS_COMPILED%s%s%s%s,\n", + fprintf(f," MY_CS_COMPILED%s%s%s%s%s,\n", cs->state & MY_CS_BINSORT ? "|MY_CS_BINSORT" : "", cs->state & MY_CS_PRIMARY ? "|MY_CS_PRIMARY" : "", is_case_sensitive(cs) ? "|MY_CS_CSSORT" : "", - my_charset_is_8bit_pure_ascii(cs) ? "|MY_CS_PUREASCII" : ""); + my_charset_is_8bit_pure_ascii(cs) ? "|MY_CS_PUREASCII" : "", + !my_charset_is_ascii_compatible(cs) ? "|MY_CS_NONASCII": ""); if (cs->name) { |