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-bin.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-bin.c')
| -rw-r--r-- | strings/ctype-bin.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/strings/ctype-bin.c b/strings/ctype-bin.c index 2363a235550..76e8da25fc2 100644 --- a/strings/ctype-bin.c +++ b/strings/ctype-bin.c @@ -69,7 +69,7 @@ static const uchar bin_char_array[] = static my_bool my_coll_init_8bit_bin(struct charset_info_st *cs, - void *(*alloc)(size_t) __attribute__((unused))) + MY_CHARSET_LOADER *loader __attribute__((unused))) { cs->max_sort_char=255; return FALSE; @@ -571,11 +571,10 @@ struct charset_info_st my_charset_bin = bin_char_array, /* to_lower */ bin_char_array, /* to_upper */ NULL, /* sort_order */ - NULL, /* contractions */ - NULL, /* sort_order_big*/ + NULL, /* uca */ NULL, /* tab_to_uni */ NULL, /* tab_from_uni */ - my_unicase_default, /* caseinfo */ + &my_unicase_default, /* caseinfo */ NULL, /* state_map */ NULL, /* ident_map */ 1, /* strxfrm_multiply */ |