Skip to content

Commit

Permalink
Merging from 5.1
Browse files Browse the repository at this point in the history 
--BZR--
revision-id: alexander.barkov@oracle.com-20120202122548-0en2xgyf16kl8kjm
property-branch-nick: mysql-5.5
testament3-sha1: 602a6b947f71925aa61e382343aa18385346f8d0
  • Loading branch information
Alexander Barkov committed Feb 2, 2012
2 parents 8ccec8e + abece3d commit feeadc2
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 0 deletions.
2 changes: 2 additions & 0 deletions mysql-test/suite/engines/funcs/r/db_alter_collate_ascii.result
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ utf8_persian_ci utf8 208 # #
utf8_esperanto_ci utf8 209 # #
utf8_hungarian_ci utf8 210 # #
utf8_sinhala_ci utf8 211 # #
utf8_general_mysql500_ci utf8 223 # #
ucs2_general_ci ucs2 35 Yes # #
ucs2_bin ucs2 90 # #
ucs2_unicode_ci ucs2 128 # #
Expand All @@ -99,6 +100,7 @@ ucs2_persian_ci ucs2 144 # #
ucs2_esperanto_ci ucs2 145 # #
ucs2_hungarian_ci ucs2 146 # #
ucs2_sinhala_ci ucs2 147 # #
ucs2_general_mysql500_ci ucs2 159 # #
cp866_general_ci cp866 36 Yes # #
cp866_bin cp866 68 # #
keybcs2_general_ci keybcs2 37 Yes # #
Expand Down
2 changes: 2 additions & 0 deletions mysql-test/suite/engines/funcs/r/db_alter_collate_utf8.result
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ utf8_persian_ci utf8 208 # #
utf8_esperanto_ci utf8 209 # #
utf8_hungarian_ci utf8 210 # #
utf8_sinhala_ci utf8 211 # #
utf8_general_mysql500_ci utf8 223 # #
ucs2_general_ci ucs2 35 Yes # #
ucs2_bin ucs2 90 # #
ucs2_unicode_ci ucs2 128 # #
Expand All @@ -99,6 +100,7 @@ ucs2_persian_ci ucs2 144 # #
ucs2_esperanto_ci ucs2 145 # #
ucs2_hungarian_ci ucs2 146 # #
ucs2_sinhala_ci ucs2 147 # #
ucs2_general_mysql500_ci ucs2 159 # #
cp866_general_ci cp866 36 Yes # #
cp866_bin cp866 68 # #
keybcs2_general_ci keybcs2 37 Yes # #
Expand Down

0 comments on commit feeadc2

Please sign in to comment.