diff options
| author | bar@bar.myoffice.izhnet.ru <> | 2007-08-03 15:30:31 +0500 |
|---|---|---|
| committer | bar@bar.myoffice.izhnet.ru <> | 2007-08-03 15:30:31 +0500 |
| commit | c01ce7b1e3bda657cf4277df413b49945593360f (patch) | |
| tree | c657f898b9581b0e2a19433212ad42eca9646b98 /strings/ctype-extra.c | |
| parent | 4c208499a409d9e558ca019e9e101115d801bab7 (diff) | |
| parent | 4eebfd09c2b045258615bf07990deb6f0f73f729 (diff) | |
| download | mariadb-git-c01ce7b1e3bda657cf4277df413b49945593360f.tar.gz | |
Merge mysql.com:/home/bar/mysql-work/mysql-5.0.b28875
into mysql.com:/home/bar/mysql-work/mysql-5.0-rpl
Diffstat (limited to 'strings/ctype-extra.c')
| -rw-r--r-- | strings/ctype-extra.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/strings/ctype-extra.c b/strings/ctype-extra.c index bf45b5b5d75..38aa3a05adf 100644 --- a/strings/ctype-extra.c +++ b/strings/ctype-extra.c @@ -6722,7 +6722,7 @@ CHARSET_INFO compiled_charsets[] = { #ifdef HAVE_CHARSET_ascii { 11,0,0, - MY_CS_COMPILED|MY_CS_PRIMARY, + MY_CS_COMPILED|MY_CS_PRIMARY|MY_CS_PUREASCII, "ascii", /* cset name */ "ascii_general_ci", /* coll name */ "", /* comment */ @@ -7811,7 +7811,7 @@ CHARSET_INFO compiled_charsets[] = { #ifdef HAVE_CHARSET_ascii { 65,0,0, - MY_CS_COMPILED|MY_CS_BINSORT, + MY_CS_COMPILED|MY_CS_BINSORT|MY_CS_PUREASCII, "ascii", /* cset name */ "ascii_bin", /* coll name */ "", /* comment */ |