Skip to content

M
mariadb
Commit e6ce99e6 authored by Alexander Barkov's avatar Alexander Barkov
Browse files
Options

Merging from 5.1

parents 1fbbacfe bbcc86f5
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 0 deletions
mysql-test/suite/engines/funcs/r/db_alter_collate_ascii.result
View file @ e6ce99e6
...@@ -77,6 +77,7 @@ utf8_persian_ci utf8 208 # # ...@@ -77,6 +77,7 @@ utf8_persian_ci utf8 208 # #
utf8_esperanto_ci utf8 209 # # utf8_esperanto_ci utf8 209 # #
utf8_hungarian_ci utf8 210 # # utf8_hungarian_ci utf8 210 # #
utf8_sinhala_ci utf8 211 # # utf8_sinhala_ci utf8 211 # #
utf8_general_mysql500_ci utf8 223 # #
ucs2_general_ci ucs2 35 Yes # # ucs2_general_ci ucs2 35 Yes # #
ucs2_bin ucs2 90 # # ucs2_bin ucs2 90 # #
ucs2_unicode_ci ucs2 128 # # ucs2_unicode_ci ucs2 128 # #
...@@ -99,6 +100,7 @@ ucs2_persian_ci ucs2 144 # # ...@@ -99,6 +100,7 @@ ucs2_persian_ci ucs2 144 # #
ucs2_esperanto_ci ucs2 145 # # ucs2_esperanto_ci ucs2 145 # #
ucs2_hungarian_ci ucs2 146 # # ucs2_hungarian_ci ucs2 146 # #
ucs2_sinhala_ci ucs2 147 # # ucs2_sinhala_ci ucs2 147 # #
ucs2_general_mysql500_ci ucs2 159 # #
cp866_general_ci cp866 36 Yes # # cp866_general_ci cp866 36 Yes # #
cp866_bin cp866 68 # # cp866_bin cp866 68 # #
keybcs2_general_ci keybcs2 37 Yes # # keybcs2_general_ci keybcs2 37 Yes # #
......
mysql-test/suite/engines/funcs/r/db_alter_collate_utf8.result
View file @ e6ce99e6
...@@ -77,6 +77,7 @@ utf8_persian_ci utf8 208 # # ...@@ -77,6 +77,7 @@ utf8_persian_ci utf8 208 # #
utf8_esperanto_ci utf8 209 # # utf8_esperanto_ci utf8 209 # #
utf8_hungarian_ci utf8 210 # # utf8_hungarian_ci utf8 210 # #
utf8_sinhala_ci utf8 211 # # utf8_sinhala_ci utf8 211 # #
utf8_general_mysql500_ci utf8 223 # #
ucs2_general_ci ucs2 35 Yes # # ucs2_general_ci ucs2 35 Yes # #
ucs2_bin ucs2 90 # # ucs2_bin ucs2 90 # #
ucs2_unicode_ci ucs2 128 # # ucs2_unicode_ci ucs2 128 # #
...@@ -99,6 +100,7 @@ ucs2_persian_ci ucs2 144 # # ...@@ -99,6 +100,7 @@ ucs2_persian_ci ucs2 144 # #
ucs2_esperanto_ci ucs2 145 # # ucs2_esperanto_ci ucs2 145 # #
ucs2_hungarian_ci ucs2 146 # # ucs2_hungarian_ci ucs2 146 # #
ucs2_sinhala_ci ucs2 147 # # ucs2_sinhala_ci ucs2 147 # #
ucs2_general_mysql500_ci ucs2 159 # #
cp866_general_ci cp866 36 Yes # # cp866_general_ci cp866 36 Yes # #
cp866_bin cp866 68 # # cp866_bin cp866 68 # #
keybcs2_general_ci keybcs2 37 Yes # # keybcs2_general_ci keybcs2 37 Yes # #
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7