diff options
| author | unknown <jani@ua141d10.elisa.omakaista.fi> | 2005-03-01 14:50:59 +0200 |
|---|---|---|
| committer | unknown <jani@ua141d10.elisa.omakaista.fi> | 2005-03-01 14:50:59 +0200 |
| commit | 425573747f54cf54187a0985e21fddf580c8e924 (patch) | |
| tree | de6c64a9195bb705263b9e50dd5fe861ba9a7dff /strings | |
| parent | 679088a2ae1353f14a970182fa64f58170e81b72 (diff) | |
| parent | 1a3ee0dec50cb71d314ed6935a012760f0cb72d4 (diff) | |
| download | mariadb-git-425573747f54cf54187a0985e21fddf580c8e924.tar.gz | |
Merge
mysql-test/r/func_group.result:
Auto merged
mysql-test/r/ps.result:
Auto merged
mysql-test/r/select_found.result:
Auto merged
mysql-test/r/show_check.result:
Auto merged
mysql-test/t/func_group.test:
Auto merged
mysql-test/t/show_check.test:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_show.cc:
Auto merged
strings/ctype-bin.c:
Auto merged
sql/sql_select.cc:
SCCS merged
Diffstat (limited to 'strings')
| -rw-r--r-- | strings/ctype-bin.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/strings/ctype-bin.c b/strings/ctype-bin.c index 916ef6d271b..9f0e334d3a9 100644 --- a/strings/ctype-bin.c +++ b/strings/ctype-bin.c @@ -67,6 +67,13 @@ static uchar bin_char_array[] = }; +static my_bool +my_coll_init_8bit_bin(CHARSET_INFO *cs, + void *(*alloc)(uint) __attribute__((unused))) +{ + cs->max_sort_char=255; + return FALSE; +} static int my_strnncoll_binary(CHARSET_INFO * cs __attribute__((unused)), const uchar *s, uint slen, @@ -443,7 +450,7 @@ skip: MY_COLLATION_HANDLER my_collation_8bit_bin_handler = { - NULL, /* init */ + my_coll_init_8bit_bin, my_strnncoll_8bit_bin, my_strnncollsp_8bit_bin, my_strnxfrm_8bit_bin, |