diff options
| author | unknown <bar@mysql.com> | 2006-04-05 19:00:02 +0500 |
|---|---|---|
| committer | unknown <bar@mysql.com> | 2006-04-05 19:00:02 +0500 |
| commit | f3a4f0afff864b9f0dad6b269e75f1d59842915e (patch) | |
| tree | ab49ff65196d97ae9080789c3583d77b91596881 /sql/share/charsets/Index.xml | |
| parent | bae996f67c96909abd5ed0d44072e03e72e8e360 (diff) | |
| parent | 0a2cd4bb9f14c0e49b536063e304d9c9934f48a9 (diff) | |
| download | mariadb-git-f3a4f0afff864b9f0dad6b269e75f1d59842915e.tar.gz | |
Merge mysql.com:/usr/home/bar/mysql-5.0
into mysql.com:/usr/home/bar/mysql-5.1-new
mysql-test/r/information_schema.result:
Auto merged
mysql-test/t/information_schema.test:
Auto merged
sql/item.cc:
Auto merged
sql/share/charsets/Index.xml:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
Diffstat (limited to 'sql/share/charsets/Index.xml')
| -rw-r--r-- | sql/share/charsets/Index.xml | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sql/share/charsets/Index.xml b/sql/share/charsets/Index.xml index 6db14f22264..3f1a25072b7 100644 --- a/sql/share/charsets/Index.xml +++ b/sql/share/charsets/Index.xml @@ -115,7 +115,10 @@ To make maintaining easier please: <alias>l1</alias> <alias>latin1</alias> <collation name="latin1_german1_ci" id="5" order="German Duden"/> - <collation name="latin1_swedish_ci" id="8" order="Finnish, Swedish" flag="primary"/> + <collation name="latin1_swedish_ci" id="8" order="Finnish, Swedish"> + <flag>primary</flag> + <flag>compiled</flag> + </collation> <collation name="latin1_danish_ci" id="15" order="Danish"/> <collation name="latin1_german2_ci" id="31" order="German Phonebook" flag="compiled"/> <collation name="latin1_spanish_ci" id="94" order="Spanish"/> |