diff options
| author | Narayanan V <v.narayanan@sun.com> | 2009-04-13 16:26:21 +0530 |
|---|---|---|
| committer | Narayanan V <v.narayanan@sun.com> | 2009-04-13 16:26:21 +0530 |
| commit | 93b132c5eef8a68b3a2a217fb2e12fa158c4045f (patch) | |
| tree | 41c52a84f53596169cf30ec7d1aaca63f9ce6509 /storage | |
| parent | 538fdd3d4b63795416bcf5bec578c9a8475110e9 (diff) | |
| parent | 39d9d106bf7ba62b0e33bfe3bd2028dbd54c55a7 (diff) | |
| download | mariadb-git-93b132c5eef8a68b3a2a217fb2e12fa158c4045f.tar.gz | |
merging with mysql-5.1-bugteam tree
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/ibmdb2i/db2i_collationSupport.cc | 8 |
1 files 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"} |