merging with mysql-5.1-bugteam tree

storage/ibmdb2i/db2i_collationSupport.cc

@@ -111,7 +111,7 @@ static const char* mySQLCollation[MAX_COLLATION] =
     {"ucs2_slovak"},
     {"ucs2_slovenian"},
     {"ucs2_spanish"},
-    {"ucs2_spanish2"},
+    {"ucs2_swedish"},
     {"ucs2_turkish"},
     {"ucs2_unicode"},
     {"ucs2"},
@@ -132,7 +132,7 @@ static const char* mySQLCollation[MAX_COLLATION] =
     {"utf8_slovak"},
     {"utf8_slovenian"},
     {"utf8_spanish"},
-    {"utf8_spanish2"},
+    {"utf8_swedish"},
     {"utf8_turkish"},
     {"utf8_unicode"},
     {"utf8"}
@@ -205,7 +205,7 @@ static const char* mySqlSortSequence[MAX_COLLATION] =
     {"ASK"},
     {"ASL"},
     {"AES"},
-    {"AES__TRADIT"},
+    {"ASW"},
     {"ATR"},
     {"AEN"},
     {"*HEX"},
@@ -226,7 +226,7 @@ static const char* mySqlSortSequence[MAX_COLLATION] =
     {"ASK"},
     {"ASL"},
     {"AES"},
-    {"AES__TRADIT"},
+    {"ASW"},
     {"ATR"},
     {"AEN"},
     {"*HEX"}