From 39d9d106bf7ba62b0e33bfe3bd2028dbd54c55a7 Mon Sep 17 00:00:00 2001
From: Narayanan V <v.narayanan@sun.com>
Date: Fri, 10 Apr 2009 11:56:54 +0530
Subject: [PATCH] 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 | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/storage/ibmdb2i/db2i_collationSupport.cc b/storage/ibmdb2i/db2i_collationSupport.cc
index 26ad0c9dee6..a41f211a689 100644
--- a/storage/ibmdb2i/db2i_collationSupport.cc
+++ b/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"}