diff options
| author | Alexander Barkov <bar@mariadb.org> | 2016-09-06 12:37:11 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2016-09-06 12:37:11 +0400 |
| commit | e4f6fd5e1252f8c68f449fe820bae88c18bca8f5 (patch) | |
| tree | 18830c670cfe3020e72565220096cdf4290d8858 /mysql-test/std_data | |
| parent | 8ae65920fabddb9157cddb547cf914b4a63539bf (diff) | |
| download | mariadb-git-e4f6fd5e1252f8c68f449fe820bae88c18bca8f5.tar.gz | |
MDEV-10743 LDML: a new syntax to reuse sort order from another 8bit simple collation
Diffstat (limited to 'mysql-test/std_data')
| -rw-r--r-- | mysql-test/std_data/ldml/Index.xml | 21 | ||||
| -rw-r--r-- | mysql-test/std_data/ldml/ascii2.xml | 6 |
2 files changed, 27 insertions, 0 deletions
diff --git a/mysql-test/std_data/ldml/Index.xml b/mysql-test/std_data/ldml/Index.xml index 66de0c725b7..8a59517069d 100644 --- a/mysql-test/std_data/ldml/Index.xml +++ b/mysql-test/std_data/ldml/Index.xml @@ -319,8 +319,29 @@ </charset> <charset name="ascii2"> + <!-- + Notes: + - ascii2 has two collations with "binary" flag. + ctype_ldml.test makes sure that + CREATE TABLE t1 (a VARCHAR(10) CHARACTER SET ascii2 BINARY); + uses ascii2_bin2, which is the collation with the least ID. + - ascii2_general_inherited_ci inherits sort order in ascii2.xml + - ascii2_genegal_inherited2_ci inherits sort order directly in this file. + --> + <collation name="ascii2_bin2" id="319" flag="binary"/> <collation name="ascii2_general_ci" id="320" flag="primary"/> <collation name="ascii2_bin" id="321" flag="binary"/> + <collation name="ascii2_general_inherited_ci" id="322"/> + <collation name="ascii2_general_inherited2_ci" id="323"> + <rules> + <import source="ascii2_general_ci"/> + </rules> + </collation> + <collation name="ascii2_badly_inherited_ci" id="324"> + <rules> + <import source="ascii2_non_existing_ci"/> + </rules> + </collation> </charset> <charset name="latin1"> diff --git a/mysql-test/std_data/ldml/ascii2.xml b/mysql-test/std_data/ldml/ascii2.xml index f1936e020be..34a2dd484a0 100644 --- a/mysql-test/std_data/ldml/ascii2.xml +++ b/mysql-test/std_data/ldml/ascii2.xml @@ -116,6 +116,12 @@ <collation name="ascii2_bin" flag="binary"/> +<collation name="ascii2_general_inherited_ci"> + <rules> + <import source="ascii2_general_ci"/> + </rules> +</collation> + </charset> </charsets> |