diff options
| author | Alexander Barkov <bar@mnogosearch.org> | 2013-10-23 20:25:52 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mnogosearch.org> | 2013-10-23 20:25:52 +0400 |
| commit | 426d246f5b8a4c598a913838b625e05e63ccb41f (patch) | |
| tree | 16792dd3268c0ec0fb02837c761a535af1938b1f /strings/ctype-ujis.c | |
| parent | de8e306b6921ab32aedde957594e570166a7fce1 (diff) | |
| download | mariadb-git-426d246f5b8a4c598a913838b625e05e63ccb41f.tar.gz | |
MDEV-5163 Merge WEIGHT_STRING function from MySQL-5.6
Diffstat (limited to 'strings/ctype-ujis.c')
| -rw-r--r-- | strings/ctype-ujis.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/strings/ctype-ujis.c b/strings/ctype-ujis.c index 0f405825830..9a69995b278 100644 --- a/strings/ctype-ujis.c +++ b/strings/ctype-ujis.c @@ -67258,7 +67258,7 @@ static MY_COLLATION_HANDLER my_collation_ci_handler = NULL, /* init */ my_strnncoll_simple,/* strnncoll */ my_strnncollsp_simple, - my_strnxfrm_simple, /* strnxfrm */ + my_strnxfrm_mb, /* strnxfrm */ my_strnxfrmlen_simple, my_like_range_mb, /* like_range */ my_wildcmp_mb, /* wildcmp */ @@ -67328,6 +67328,7 @@ struct charset_info_st my_charset_ujis_japanese_ci= 0xFEFE, /* max_sort_char */ ' ', /* pad char */ 0, /* escape_with_backslash_is_dangerous */ + 1, /* levels_for_order */ &my_charset_handler, &my_collation_ci_handler }; @@ -67360,6 +67361,7 @@ struct charset_info_st my_charset_ujis_bin= 0xFEFE, /* max_sort_char */ ' ', /* pad char */ 0, /* escape_with_backslash_is_dangerous */ + 1, /* levels_for_order */ &my_charset_handler, &my_collation_mb_bin_handler }; |