diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-12-16 21:02:21 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-12-16 21:02:21 +0300 |
| commit | 09942fe8e89778e8b9ab99a8f0aa941a7fc95b16 (patch) | |
| tree | c656767fe54a976ffb669926348b9fac198be312 /mysql-test/std_data | |
| parent | f0ae3168a3f2b16fd0718ca4b93533293c5deea8 (diff) | |
| parent | efe619585840b27ef156b35f2be6ef3c9809d2e5 (diff) | |
| download | mariadb-git-09942fe8e89778e8b9ab99a8f0aa941a7fc95b16.tar.gz | |
Manual merge from mysql-trunk-merge.
Conflicts:
- include/my_no_pthread.h
- mysql-test/r/sp-ucs2.result
- sql/log.cc
- sql/sql_acl.cc
- sql/sql_yacc.yy
Diffstat (limited to 'mysql-test/std_data')
| -rw-r--r-- | mysql-test/std_data/Index.xml | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/mysql-test/std_data/Index.xml b/mysql-test/std_data/Index.xml index 4feb868583e..e4964a33419 100644 --- a/mysql-test/std_data/Index.xml +++ b/mysql-test/std_data/Index.xml @@ -18,6 +18,13 @@ </rules> </collation> + <collation name="utf8_hugeid_ci" id="2047000000"> + <rules> + <reset>a</reset> + <s>b</s> + </rules> + </collation> + <collation name="utf8_maxuserid_ci" id="2047"> <rules> <reset>a</reset> |