Merge mysql.com:/usr/home/bar/mysql-5.0.b12547

into  mysql.com:/usr/home/bar/mysql-5.0.char1


strings/ctype-cp932.c:
  Auto merged
This commit is contained in:
unknown 2005-10-14 13:37:19 +05:00
commit 04d52fab7a
108 changed files with 3771 additions and 497 deletions

View file

@ -5522,6 +5522,7 @@ CHARSET_INFO my_charset_cp932_japanese_ci=
2, /* mbmaxlen */
0, /* min_sort_char */
255, /* max_sort_char */
' ', /* pad char */
1, /* escape_with_backslash_is_dangerous */
&my_charset_handler,
&my_collation_ci_handler
@ -5553,6 +5554,7 @@ CHARSET_INFO my_charset_cp932_bin=
2, /* mbmaxlen */
0, /* min_sort_char */
255, /* max_sort_char */
' ', /* pad char */
1, /* escape_with_backslash_is_dangerous */
&my_charset_handler,
&my_collation_mb_bin_handler