summaryrefslogtreecommitdiff
path: root/mysql-test/std_data
diff options
context:
space:
mode:
authorAlexander Barkov <bar@mysql.com>2009-10-15 15:17:32 +0500
committerAlexander Barkov <bar@mysql.com>2009-10-15 15:17:32 +0500
commitf8a54c72ff3dc33a5dec9257f05d0f284f244292 (patch)
tree7f2c2690a6c4b4439750de17315dbc10dec56617 /mysql-test/std_data
parent583b8530922c7812da9f684fe6b69579aeee4a1f (diff)
downloadmariadb-git-f8a54c72ff3dc33a5dec9257f05d0f284f244292.tar.gz
Backporting WL#4164 Two-byte collation IDs
Diffstat (limited to 'mysql-test/std_data')
-rw-r--r--mysql-test/std_data/Index.xml12
1 files changed, 9 insertions, 3 deletions
diff --git a/mysql-test/std_data/Index.xml b/mysql-test/std_data/Index.xml
index 988dddcc68a..c77d8996229 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>