Commit ee64a8d4 authored by Narayanan V's avatar Narayanan V

Bug#44020 Unicode Swedish collations not working with IBMDB2I

The utf8_swedish_ci and ucs2_swedish_ci
collations do not work with indexes on 
IBMDB2I tables.

The current patch adds the mapping for
ucs2_swedish collation and removes the 
ucs2_spanish2 mapping which is not
supported by any version of the operating
system.

storage/ibmdb2i/db2i_collationSupport.cc:
  Removed mapping for ucs2_spanish2 collation
  since it is not supported by any version of the operating system. Added mapping for ucs2_swedish
  collation which had been overlooked but is
  supported by the IBM i 6.1.
parent d0bc4e26
...@@ -111,7 +111,7 @@ static const char* mySQLCollation[MAX_COLLATION] = ...@@ -111,7 +111,7 @@ static const char* mySQLCollation[MAX_COLLATION] =
{"ucs2_slovak"}, {"ucs2_slovak"},
{"ucs2_slovenian"}, {"ucs2_slovenian"},
{"ucs2_spanish"}, {"ucs2_spanish"},
{"ucs2_spanish2"}, {"ucs2_swedish"},
{"ucs2_turkish"}, {"ucs2_turkish"},
{"ucs2_unicode"}, {"ucs2_unicode"},
{"ucs2"}, {"ucs2"},
...@@ -132,7 +132,7 @@ static const char* mySQLCollation[MAX_COLLATION] = ...@@ -132,7 +132,7 @@ static const char* mySQLCollation[MAX_COLLATION] =
{"utf8_slovak"}, {"utf8_slovak"},
{"utf8_slovenian"}, {"utf8_slovenian"},
{"utf8_spanish"}, {"utf8_spanish"},
{"utf8_spanish2"}, {"utf8_swedish"},
{"utf8_turkish"}, {"utf8_turkish"},
{"utf8_unicode"}, {"utf8_unicode"},
{"utf8"} {"utf8"}
...@@ -205,7 +205,7 @@ static const char* mySqlSortSequence[MAX_COLLATION] = ...@@ -205,7 +205,7 @@ static const char* mySqlSortSequence[MAX_COLLATION] =
{"ASK"}, {"ASK"},
{"ASL"}, {"ASL"},
{"AES"}, {"AES"},
{"AES__TRADIT"}, {"ASW"},
{"ATR"}, {"ATR"},
{"AEN"}, {"AEN"},
{"*HEX"}, {"*HEX"},
...@@ -226,7 +226,7 @@ static const char* mySqlSortSequence[MAX_COLLATION] = ...@@ -226,7 +226,7 @@ static const char* mySqlSortSequence[MAX_COLLATION] =
{"ASK"}, {"ASK"},
{"ASL"}, {"ASL"},
{"AES"}, {"AES"},
{"AES__TRADIT"}, {"ASW"},
{"ATR"}, {"ATR"},
{"AEN"}, {"AEN"},
{"*HEX"} {"*HEX"}
......
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