Commit 89165fbc authored by unknown's avatar unknown
Browse files

Fix wrong auto-merge. 


strings/ctype-cp932.c:
  Fixes from merge
strings/ctype-eucjpms.c:
  Fixes from wrong auto-merge
parent 585b67ae

strings/ctype-cp932.c

+2 −0
Original line number Diff line number Diff line
@@ -5522,6 +5522,7 @@ CHARSET_INFO my_charset_cp932_japanese_ci= 
    2,			/* mbmaxlen */

    0,			/* min_sort_char */

    255,		/* max_sort_char */

    1,                  /* escape_with_backslash_is_dangerous */

    &my_charset_handler,

    &my_collation_ci_handler

};
@@ -5552,6 +5553,7 @@ CHARSET_INFO my_charset_cp932_bin= 
    2,			/* mbmaxlen */

    0,			/* min_sort_char */

    255,		/* max_sort_char */

    1,                  /* escape_with_backslash_is_dangerous */

    &my_charset_handler,

    &my_collation_mb_bin_handler

};

strings/ctype-eucjpms.c

+2 −0
Original line number Diff line number Diff line
@@ -8708,6 +8708,7 @@ CHARSET_INFO my_charset_eucjpms_japanese_ci= 
    3,			/* mbmaxlen     */

    0,			/* min_sort_char */

    255,		/* max_sort_char */

    0,                  /* escape_with_backslash_is_dangerous */

    &my_charset_handler,

    &my_collation_ci_handler

};
@@ -8739,6 +8740,7 @@ CHARSET_INFO my_charset_eucjpms_bin= 
    3,			/* mbmaxlen     */

    0,			/* min_sort_char */

    255,		/* max_sort_char */

    0,                  /* escape_with_backslash_is_dangerous */

    &my_charset_handler,

    &my_collation_mb_bin_handler

};