diff options
author | unknown <bar@mysql.com/bar.myoffice.izhnet.ru> | 2007-06-07 17:55:55 +0500 |
---|---|---|
committer | unknown <bar@mysql.com/bar.myoffice.izhnet.ru> | 2007-06-07 17:55:55 +0500 |
commit | af0a3afe054cc2be3600180cfdeef28761be2f7e (patch) | |
tree | 6e38a11989e338107855129634fe59859fd19419 /mysql-test/std_data | |
parent | c3ba8178b5c8d9c3d885119f4a1f4bc103513578 (diff) | |
download | mariadb-git-af0a3afe054cc2be3600180cfdeef28761be2f7e.tar.gz |
Bug#28916 LDML doesn't work for utf8
and is not described in the manual
- Adding missing initialization for utf8 collations
- Minor code clean-ups: renaming variables,
moving code into a new separate function.
- Adding test, to check that both ucs2 and utf8 user
defined collations work (ucs2_test_ci and utf8_test_ci)
- Adding Vietnamese collation as a complex user defined
collation example.
include/m_ctype.h:
Renaming variable names to match collation names (for convenience).
mysys/charset-def.c:
- Removing redundant declarations for variables declared in m_ctype.h
- Renaming variable names to match collation names (for convenience).
mysys/charset.c:
- Renaming "new" to "newcs", to avoid using C reserved word as a variable name
- Moving UCA initialization code into a separate function
- The bug fix itself: adding initialization of utf8 collations
strings/ctype-uca.c:
Renaming variable names to match collation names (for convenience).
strings/ctype.c:
Increasing buffer size to fit tailoring for languages
with complex rules (e.g. Vietnamese).
mysql-test/r/ctype_ldml.result:
Adding test case
mysql-test/std_data/Index.xml:
Adding Index.xml example with user defined collations.
mysql-test/t/ctype_ldml-master.opt:
Adding OPT file for the test case,
to use the example Index.xml file.
mysql-test/t/ctype_ldml.test:
Adding test case
Diffstat (limited to 'mysql-test/std_data')
-rw-r--r-- | mysql-test/std_data/Index.xml | 71 |
1 files changed, 71 insertions, 0 deletions
diff --git a/mysql-test/std_data/Index.xml b/mysql-test/std_data/Index.xml new file mode 100644 index 00000000000..988dddcc68a --- /dev/null +++ b/mysql-test/std_data/Index.xml @@ -0,0 +1,71 @@ +<charsets> + + <charset name="utf8"> + <collation name="utf8_test_ci" id="240"> + <rules> + <reset>a</reset> + <s>b</s> + </rules> + </collation> + + </charset> + + <charset name="ucs2"> + <collation name="ucs2_test_ci" id="241"> + <rules> + <reset>a</reset> + <s>b</s> + </rules> + </collation> + <collation name="ucs2_vn_ci" id="242"> + <!-- Vietnamese experimental collation --> + <rules> + <reset>A</reset> + <p>\u0103</p><t>\u0102</t> + <s>\u1EB1</s><t>\u1EB0</t> + <s>\u1EB3</s><t>\u1EB2</t> + <s>\u1EB5</s><t>\u1EB4</t> + <s>\u1EAF</s><t>\u1EAE</t> + <s>\u1EB7</s><t>\u1EB6</t> + <p>\u00E2</p><t>\u00C2</t> + <s>\u1EA7</s><t>\u1EA6</t> + <s>\u1EA9</s><t>\u1EA8</t> + <s>\u1EAB</s><t>\u1EAA</t> + <s>\u1EA5</s><t>\u1EA4</t> + <s>\u1EAD</s><t>\u1EAC</t> + <reset>D</reset> + <p>\u0111</p><t>\u0110</t> + <reset>E</reset> + <p>\u00EA</p><t>\u00CA</t> + <s>\u1EC1</s><t>\u1EC0</t> + <s>\u1EC3</s><t>\u1EC2</t> + <s>\u1EC5</s><t>\u1EC4</t> + <s>\u1EBF</s><t>\u1EBE</t> + <s>\u1EC7</s><t>\u1EC6</t> + <reset>O</reset> + <p>\u00F4</p><t>\u00D4</t> + <s>\u1ED3</s><t>\u1ED2</t> + <s>\u1ED5</s><t>\u1ED4</t> + <s>\u1ED7</s><t>\u1ED6</t> + <s>\u1ED1</s><t>\u1ED0</t> + <s>\u1ED9</s><t>\u1ED8</t> + <p>\u01A1</p><t>\u01A0</t> + <s>\u1EDD</s><t>\u1EDC</t> + <s>\u1EDF</s><t>\u1EDE</t> + <s>\u1EE1</s><t>\u1EE0</t> + <s>\u1EDB</s><t>\u1EDA</t> + <s>\u1EE3</s><t>\u1EE2</t> + <reset>U</reset> + <p>\u01B0</p><t>\u01AF</t> + <s>\u1EEB</s><t>\u1EEA</t> + <s>\u1EED</s><t>\u1EEC</t> + <s>\u1EEF</s><t>\u1EEE</t> + <s>\u1EE9</s><t>\u1EE8</t> + <s>\u1EF1</s><t>\u1EF0</t> + </rules> + + </collation> + + </charset> + +</charsets> |