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-sjis.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-sjis.c')
| -rw-r--r-- | strings/ctype-sjis.c | 29 |
1 files changed, 17 insertions, 12 deletions
diff --git a/strings/ctype-sjis.c b/strings/ctype-sjis.c index 50756799a56..2c3d2b34dab 100644 --- a/strings/ctype-sjis.c +++ b/strings/ctype-sjis.c @@ -197,7 +197,7 @@ static uint mbcharlen_sjis(CHARSET_INFO *cs __attribute__((unused)),uint c) #define sjiscode(c,d) ((((uint) (uchar)(c)) << 8) | (uint) (uchar) (d)) -static MY_UNICASE_INFO c81[256]= +static MY_UNICASE_CHARACTER c81[256]= { /* 8100-810F */ {0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0}, @@ -407,7 +407,7 @@ static MY_UNICASE_INFO c81[256]= }; -static MY_UNICASE_INFO c82[256]= +static MY_UNICASE_CHARACTER c82[256]= { /* 8200-820F */ {0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0}, @@ -615,7 +615,7 @@ static MY_UNICASE_INFO c82[256]= }; -static MY_UNICASE_INFO c83[256]= +static MY_UNICASE_CHARACTER c83[256]= { /* 8300-830F */ {0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0}, @@ -825,7 +825,7 @@ static MY_UNICASE_INFO c83[256]= }; -static MY_UNICASE_INFO c84[256]= +static MY_UNICASE_CHARACTER c84[256]= { /* 8400-840F */ {0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0},{0,0,0}, @@ -1035,7 +1035,7 @@ static MY_UNICASE_INFO c84[256]= }; -static MY_UNICASE_INFO *my_caseinfo_sjis[256]= +static MY_UNICASE_CHARACTER *my_caseinfo_pages_sjis[256]= { NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, /* 0 */ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, @@ -1072,7 +1072,14 @@ static MY_UNICASE_INFO *my_caseinfo_sjis[256]= }; -static int my_strnncoll_sjis_internal(CHARSET_INFO *cs, +static MY_UNICASE_INFO my_caseinfo_sjis= +{ + 0xFFFF, + my_caseinfo_pages_sjis +}; + + +static int my_strnncoll_sjis_internal(const CHARSET_INFO *cs, const uchar **a_res, size_t a_length, const uchar **b_res, size_t b_length) { @@ -34204,11 +34211,10 @@ struct charset_info_st my_charset_sjis_japanese_ci= to_lower_sjis, to_upper_sjis, sort_order_sjis, - NULL, /* contractions */ - NULL, /* sort_order_big*/ + NULL, /* uca */ NULL, /* tab_to_uni */ NULL, /* tab_from_uni */ - my_caseinfo_sjis, /* caseinfo */ + &my_caseinfo_sjis, /* caseinfo */ NULL, /* state_map */ NULL, /* ident_map */ 1, /* strxfrm_multiply */ @@ -34236,11 +34242,10 @@ struct charset_info_st my_charset_sjis_bin= to_lower_sjis, to_upper_sjis, NULL, /* sort_order */ - NULL, /* contractions */ - NULL, /* sort_order_big*/ + NULL, /* uca */ NULL, /* tab_to_uni */ NULL, /* tab_from_uni */ - my_caseinfo_sjis, /* caseinfo */ + &my_caseinfo_sjis, /* caseinfo */ NULL, /* state_map */ NULL, /* ident_map */ 1, /* strxfrm_multiply */ |