diff options
| author | unknown <bar@mysql.com> | 2006-04-05 23:01:10 +0500 |
|---|---|---|
| committer | unknown <bar@mysql.com> | 2006-04-05 23:01:10 +0500 |
| commit | fb559d433f33dc457de061bb666c6f13cc4a4336 (patch) | |
| tree | a25d10de30881aabd94626a7b7fdd055d547213b /strings | |
| parent | 7042df6228536b05d9eabc7a428af30def8ec204 (diff) | |
| parent | 6ef757e41194c99817aa34ff7f26bb34befc0579 (diff) | |
| download | mariadb-git-fb559d433f33dc457de061bb666c6f13cc4a4336.tar.gz | |
Merge mysql.com:/usr/home/bar/mysql-5.0
into mysql.com:/usr/home/bar/mysql-5.1-new
strings/ctype-extra.c:
Auto merged
Diffstat (limited to 'strings')
| -rw-r--r-- | strings/conf_to_src.c | 3 | ||||
| -rw-r--r-- | strings/ctype-extra.c | 66 |
2 files changed, 68 insertions, 1 deletions
diff --git a/strings/conf_to_src.c b/strings/conf_to_src.c index 700b6a91070..8f7e40966b9 100644 --- a/strings/conf_to_src.c +++ b/strings/conf_to_src.c @@ -22,7 +22,7 @@ #define ROW_LEN 16 #define ROW16_LEN 8 -#define MAX_BUF 16*1024 +#define MAX_BUF 64*1024 static CHARSET_INFO all_charsets[256]; @@ -156,6 +156,7 @@ static int my_read_charset_file(const char *filename) } len=read(fd,buf,MAX_BUF); + DBUG_ASSERT(len < MAX_BUF); close(fd); if (my_parse_charset_xml(buf,len,add_collation)) diff --git a/strings/ctype-extra.c b/strings/ctype-extra.c index 9c4c834ae2f..a5230497b70 100644 --- a/strings/ctype-extra.c +++ b/strings/ctype-extra.c @@ -8527,6 +8527,72 @@ CHARSET_INFO compiled_charsets[] = { } , #endif +#ifdef HAVE_CHARSET_geostd8 +{ + 92,0,0, + MY_CS_COMPILED|MY_CS_PRIMARY, + "geostd8", /* cset name */ + "geostd8_general_ci", /* coll name */ + "", /* comment */ + NULL, /* tailoring */ + ctype_geostd8_general_ci, /* ctype */ + to_lower_geostd8_general_ci, /* lower */ + to_upper_geostd8_general_ci, /* upper */ + sort_order_geostd8_general_ci, /* sort_order */ + NULL, /* contractions */ + NULL, /* sort_order_big*/ + to_uni_geostd8_general_ci, /* to_uni */ + NULL, /* from_uni */ + my_unicase_default, /* caseinfo */ + NULL, /* state map */ + NULL, /* ident map */ + 1, /* strxfrm_multiply*/ + 1, /* caseup_multiply*/ + 1, /* casedn_multiply*/ + 1, /* mbminlen */ + 1, /* mbmaxlen */ + 0, /* min_sort_char */ + 255, /* max_sort_char */ + ' ', /* pad_char */ + 0, /* escape_with_backslash_is_dangerous */ + &my_charset_8bit_handler, + &my_collation_8bit_simple_ci_handler, +} +, +#endif +#ifdef HAVE_CHARSET_geostd8 +{ + 93,0,0, + MY_CS_COMPILED|MY_CS_BINSORT, + "geostd8", /* cset name */ + "geostd8_bin", /* coll name */ + "", /* comment */ + NULL, /* tailoring */ + ctype_geostd8_bin, /* ctype */ + to_lower_geostd8_bin, /* lower */ + to_upper_geostd8_bin, /* upper */ + NULL, /* sort_order */ + NULL, /* contractions */ + NULL, /* sort_order_big*/ + to_uni_geostd8_bin, /* to_uni */ + NULL, /* from_uni */ + my_unicase_default, /* caseinfo */ + NULL, /* state map */ + NULL, /* ident map */ + 1, /* strxfrm_multiply*/ + 1, /* caseup_multiply*/ + 1, /* casedn_multiply*/ + 1, /* mbminlen */ + 1, /* mbmaxlen */ + 0, /* min_sort_char */ + 255, /* max_sort_char */ + ' ', /* pad_char */ + 0, /* escape_with_backslash_is_dangerous */ + &my_charset_8bit_handler, + &my_collation_8bit_bin_handler, +} +, +#endif #ifdef HAVE_CHARSET_latin1 { 94,0,0, |