database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Fix wrong auto-merge.

Browse Source
This commit is contained in:
elliot@mysql.com
2005-08-19 18:17:54 -04:00
parent e9ca1bd3a7
commit 24f81a781e
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
strings/ctype-cp932.c
View File

@ -5522,6 +5522,7 @@ CHARSET_INFO my_charset_cp932_japanese_ci=
2, /* mbmaxlen */ 2, /* mbmaxlen */
0, /* min_sort_char */ 0, /* min_sort_char */
255, /* max_sort_char */ 255, /* max_sort_char */
1, /* escape_with_backslash_is_dangerous */
&my_charset_handler, &my_charset_handler,
&my_collation_ci_handler &my_collation_ci_handler
}; };
@ -5552,6 +5553,7 @@ CHARSET_INFO my_charset_cp932_bin=
2, /* mbmaxlen */ 2, /* mbmaxlen */
0, /* min_sort_char */ 0, /* min_sort_char */
255, /* max_sort_char */ 255, /* max_sort_char */
1, /* escape_with_backslash_is_dangerous */
&my_charset_handler, &my_charset_handler,
&my_collation_mb_bin_handler &my_collation_mb_bin_handler
}; };

2
strings/ctype-eucjpms.c
View File

@ -8708,6 +8708,7 @@ CHARSET_INFO my_charset_eucjpms_japanese_ci=
3, /* mbmaxlen */ 3, /* mbmaxlen */
0, /* min_sort_char */ 0, /* min_sort_char */
255, /* max_sort_char */ 255, /* max_sort_char */
0, /* escape_with_backslash_is_dangerous */
&my_charset_handler, &my_charset_handler,
&my_collation_ci_handler &my_collation_ci_handler
}; };
@ -8739,6 +8740,7 @@ CHARSET_INFO my_charset_eucjpms_bin=
3, /* mbmaxlen */ 3, /* mbmaxlen */
0, /* min_sort_char */ 0, /* min_sort_char */
255, /* max_sort_char */ 255, /* max_sort_char */
0, /* escape_with_backslash_is_dangerous */
&my_charset_handler, &my_charset_handler,
&my_collation_mb_bin_handler &my_collation_mb_bin_handler
}; };