diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-10-22 22:06:01 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-10-22 22:06:01 +0400 |
| commit | 564952afb01fa9ff1d6f4622c0f4fb35ccc037cb (patch) | |
| tree | 85bcbfa3559990f90ce21638ed46531ed888aaa3 /mysql-test/std_data/Index.xml | |
| parent | ffde6bbb15b75c94293784fa0f4264d64039f0b9 (diff) | |
| parent | bcaa7524d935464c68e34cb0657cd43517108c40 (diff) | |
| download | mariadb-git-564952afb01fa9ff1d6f4622c0f4fb35ccc037cb.tar.gz | |
Automerge from mysql-next-mr.
Diffstat (limited to 'mysql-test/std_data/Index.xml')
| -rw-r--r-- | mysql-test/std_data/Index.xml | 25 |
1 files changed, 22 insertions, 3 deletions
diff --git a/mysql-test/std_data/Index.xml b/mysql-test/std_data/Index.xml index 988dddcc68a..40fe70ebca0 100644 --- a/mysql-test/std_data/Index.xml +++ b/mysql-test/std_data/Index.xml @@ -1,23 +1,29 @@ <charsets> <charset name="utf8"> - <collation name="utf8_test_ci" id="240"> + <collation name="utf8_test_ci" id="353"> <rules> <reset>a</reset> <s>b</s> </rules> </collation> + <collation name="utf8_maxuserid_ci" id="2047"> + <rules> + <reset>a</reset> + <s>b</s> + </rules> + </collation> </charset> <charset name="ucs2"> - <collation name="ucs2_test_ci" id="241"> + <collation name="ucs2_test_ci" id="358"> <rules> <reset>a</reset> <s>b</s> </rules> </collation> - <collation name="ucs2_vn_ci" id="242"> + <collation name="ucs2_vn_ci" id="359"> <!-- Vietnamese experimental collation --> <rules> <reset>A</reset> @@ -68,4 +74,17 @@ </charset> + <charset name="latin1"> + <family>Western</family> + <description>cp1252 West European</description> + <alias>csisolatin1</alias> + <alias>iso-8859-1</alias> + <alias>iso-ir-100</alias> + <alias>iso_8859-1</alias> + <alias>iso_8859-1:1987</alias> + <alias>l1</alias> + <alias>latin1</alias> + <collation name="latin1_test" id="99" order="test"/> + </charset> + </charsets> |