diff options
| author | Alexander Barkov <bar@mnogosearch.org> | 2013-10-02 15:04:07 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mnogosearch.org> | 2013-10-02 15:04:07 +0400 |
| commit | 0b6c4bb34f99b8f4023fd0bef25a1b714f96b699 (patch) | |
| tree | 87e5f83097f30c9fb7e30928800bcc92690f6bbd /strings/ctype-big5.c | |
| parent | 9538bbfce9055f99529adb461d101b7b236eb5a3 (diff) | |
| download | mariadb-git-0b6c4bb34f99b8f4023fd0bef25a1b714f96b699.tar.gz | |
MDEV-4928 Merge collation customization improvements
Merging the following MySQL-5.6 changes:
- WL#5624: Collation customization improvements
http://dev.mysql.com/worklog/task/?id=5624
- WL#4013: Unicode german2 collation
http://dev.mysql.com/worklog/task/?id=4013
- Bug#62429 XML: ExtractValue, UpdateXML max arg length 127 chars
http://bugs.mysql.com/bug.php?id=62429
(required by WL#5624)
Diffstat (limited to 'strings/ctype-big5.c')
| -rw-r--r-- | strings/ctype-big5.c | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/strings/ctype-big5.c b/strings/ctype-big5.c index f77e705525c..cf9fc339280 100644 --- a/strings/ctype-big5.c +++ b/strings/ctype-big5.c @@ -177,7 +177,7 @@ static const uchar sort_order_big5[]= }; -static MY_UNICASE_INFO cA2[256]= +static MY_UNICASE_CHARACTER cA2[256]= { /* A200-A20F */ {0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0}, @@ -370,7 +370,7 @@ static MY_UNICASE_INFO cA2[256]= }; -static MY_UNICASE_INFO cA3[256]= +static MY_UNICASE_CHARACTER cA3[256]= { /* A300-A30F */ {0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0}, @@ -563,7 +563,7 @@ static MY_UNICASE_INFO cA3[256]= }; -static MY_UNICASE_INFO cC7[256]= +static MY_UNICASE_CHARACTER cC7[256]= { /* C700-C70F */ {0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0}, @@ -756,7 +756,7 @@ static MY_UNICASE_INFO cC7[256]= }; -static MY_UNICASE_INFO *my_caseinfo_big5[256]= +static MY_UNICASE_CHARACTER *my_caseinfo_pages_big5[256]= { NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, /* 0 */ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, @@ -793,6 +793,13 @@ static MY_UNICASE_INFO *my_caseinfo_big5[256]= }; +static MY_UNICASE_INFO my_caseinfo_big5= +{ + 0xFFFF, + my_caseinfo_pages_big5 +}; + + static uint16 big5strokexfrm(uint16 i) { if ((i == 0xA440) || (i == 0xA441)) return 0xA440; @@ -6926,11 +6933,10 @@ struct charset_info_st my_charset_big5_chinese_ci= to_lower_big5, to_upper_big5, sort_order_big5, - NULL, /* contractions */ - NULL, /* sort_order_big*/ + NULL, /* uca */ NULL, /* tab_to_uni */ NULL, /* tab_from_uni */ - my_caseinfo_big5, /* caseinfo */ + &my_caseinfo_big5, /* caseinfo */ NULL, /* state_map */ NULL, /* ident_map */ 1, /* strxfrm_multiply */ @@ -6959,11 +6965,10 @@ struct charset_info_st my_charset_big5_bin= to_lower_big5, to_upper_big5, NULL, /* sort_order */ - NULL, /* contractions */ - NULL, /* sort_order_big*/ + NULL, /* uca */ NULL, /* tab_to_uni */ NULL, /* tab_from_uni */ - my_caseinfo_big5, /* caseinfo */ + &my_caseinfo_big5, /* caseinfo */ NULL, /* state_map */ NULL, /* ident_map */ 1, /* strxfrm_multiply */ |