diff options
| author | Alexander Barkov <bar@mnogosearch.org> | 2013-11-12 16:48:57 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mnogosearch.org> | 2013-11-12 16:48:57 +0400 |
| commit | fad7371191c148bee79385ef2694a8fb337091d0 (patch) | |
| tree | 85d76162ebd94e2dfcd3eae1d2e51b9d2ad573af /mysql-test/std_data | |
| parent | 55de9b0468c65b7277b7ca6978f4e01c01af1206 (diff) | |
| download | mariadb-git-fad7371191c148bee79385ef2694a8fb337091d0.tar.gz | |
Merging xxx_unicode_520_ci and xxx_vietnamese_ci from MySQL-5.6.
Diffstat (limited to 'mysql-test/std_data')
| -rw-r--r-- | mysql-test/std_data/Index.xml | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/mysql-test/std_data/Index.xml b/mysql-test/std_data/Index.xml index 0aa415d0e48..12626a50f1f 100644 --- a/mysql-test/std_data/Index.xml +++ b/mysql-test/std_data/Index.xml @@ -140,7 +140,7 @@ </rules> </collation> - <collation name="utf8_maxuserid_ci" id="2047"> + <collation name="utf8_maxuserid_ci" id="2047" version="4.0.0"> <rules> <reset>a</reset> <s>b</s> @@ -150,10 +150,20 @@ <charset name="utf8mb4"> - <collation name="utf8mb4_test_ci" id="326"> + <collation name="utf8mb4_test_ci" id="326" version="5.2.0"> <rules> <reset>a</reset> <s>b</s> + <!-- check shift for a supplementary character --> + <i>\u10062</i> + <!-- check reset to a supplementaty character--> + <reset>\u10400</reset> + <i>\u100400</i> + <!-- check contractions with non-ascii characters --> + <reset>d</reset> + <p>d\u017e</p> + <t>D\u017e</t> + <t>D\u017d</t> </rules> </collation> <collation name="utf8mb4_test_400_ci" id="328" version="4.0.0"> |