merge with 5.1

This commit is contained in:
Sergei Golubchik 2010-09-11 20:43:48 +02:00
commit a3d80d952d
448 changed files with 9726 additions and 3454 deletions

View file

@ -8567,7 +8567,7 @@ struct charset_info_st my_charset_ujis_japanese_ci=
1, /* mbminlen */
3, /* mbmaxlen */
0, /* min_sort_char */
255, /* max_sort_char */
0xFEFE, /* max_sort_char */
' ', /* pad char */
0, /* escape_with_backslash_is_dangerous */
&my_charset_handler,
@ -8600,7 +8600,7 @@ struct charset_info_st my_charset_ujis_bin=
1, /* mbminlen */
3, /* mbmaxlen */
0, /* min_sort_char */
255, /* max_sort_char */
0xFEFE, /* max_sort_char */
' ', /* pad char */
0, /* escape_with_backslash_is_dangerous */
&my_charset_handler,