diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-03-01 13:06:11 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-03-01 13:06:11 +0300 |
| commit | e0d1373a3baec3a42dfa88544ba4d760868df049 (patch) | |
| tree | 081912c9d4ed65399258f0edf6887fe9b563e083 /mysql-test/std_data | |
| parent | 1bba800acea916d3e4d9e3e314f6f0fe03cc742d (diff) | |
| parent | 7a83782f1caa102ebc552b017885f18f005425f0 (diff) | |
| download | mariadb-git-e0d1373a3baec3a42dfa88544ba4d760868df049.tar.gz | |
Manual merge from mysql-next-mr.
Conflicts:
- sql/item.cc
Diffstat (limited to 'mysql-test/std_data')
| -rw-r--r-- | mysql-test/std_data/Index.xml | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/mysql-test/std_data/Index.xml b/mysql-test/std_data/Index.xml index e4964a33419..27358fefd54 100644 --- a/mysql-test/std_data/Index.xml +++ b/mysql-test/std_data/Index.xml @@ -33,6 +33,36 @@ </collation> </charset> + + <charset name="utf8mb4"> + <collation name="utf8mb4_test_ci" id="326"> + <rules> + <reset>a</reset> + <s>b</s> + </rules> + </collation> + </charset> + + <charset name="utf16"> + <collation name="utf16_test_ci" id="327"> + <rules> + <reset>a</reset> + <s>b</s> + </rules> + </collation> + </charset> + + + <charset name="utf32"> + <collation name="utf32_test_ci" id="391"> + <rules> + <reset>a</reset> + <s>b</s> + </rules> + </collation> + </charset> + + <charset name="ucs2"> <collation name="ucs2_test_ci" id="358"> <rules> |