diff options
| author | Alexander Barkov <bar@mysql.com> | 2009-10-21 15:48:22 +0500 |
|---|---|---|
| committer | Alexander Barkov <bar@mysql.com> | 2009-10-21 15:48:22 +0500 |
| commit | dcb8bb23c29172949781f5214b8222505752de70 (patch) | |
| tree | d2522e7182d47f0be16e18e95d3830f7ff496ce0 /mysql-test/std_data/Index.xml | |
| parent | 52701ff3277d6641994e6b76d84bb5903af48d59 (diff) | |
| parent | de7d1abe9386c2e9df1a8c5f3b95f3cd57cc6c9f (diff) | |
| download | mariadb-git-dcb8bb23c29172949781f5214b8222505752de70.tar.gz | |
Merging mysql-next-mr-merge to mysql-next-mr.
Diffstat (limited to 'mysql-test/std_data/Index.xml')
| -rw-r--r-- | mysql-test/std_data/Index.xml | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/mysql-test/std_data/Index.xml b/mysql-test/std_data/Index.xml index 3dc647d8195..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> |