Author: pd221994
Date: 2011-05-24 18:10:46 +0200 (Tue, 24 May 2011)
New Revision: 26326
Log:
r48295@dhcp-adc-twvpn-1-vpnpool-10-154-25-47: paul | 2011-05-24 09:11:34 -0500
LDML tweaks
Modified:
svk:merge
trunk/refman-5.0/globalization.xml
trunk/refman-5.1/globalization.xml
trunk/refman-5.5/globalization.xml
trunk/refman-5.6/globalization.xml
trunk/refman-6.0/globalization.xml
Property changes on: trunk
___________________________________________________________________
Modified: svk:merge
===================================================================
Changed blocks: 0, Lines Added: 0, Lines Deleted: 0; 1277 bytes
Modified: trunk/refman-5.0/globalization.xml
===================================================================
--- trunk/refman-5.0/globalization.xml 2011-05-24 16:10:18 UTC (rev 26325)
+++ trunk/refman-5.0/globalization.xml 2011-05-24 16:10:46 UTC (rev 26326)
Changed blocks: 4, Lines Added: 14, Lines Deleted: 9; 2728 bytes
@@ -7158,10 +7158,10 @@
This section describes how to add a simple collation for an
8-bit character set by writing the
<literal><collation></literal> elements associated with a
- <literal><charset></literal> character set description.
- The procedure described here does not require recompiling MySQL.
- The example adds a collation named
- <literal>latin1_test_ci</literal> to the
+ <literal><charset></literal> character set description in
+ the MySQL <filename>Index.xml</filename> file. The procedure
+ described here does not require recompiling MySQL. The example
+ adds a collation named <literal>latin1_test_ci</literal> to the
<literal>latin1</literal> character set.
</para>
@@ -7278,10 +7278,11 @@
This section describes how to add a UCA collation for a Unicode
character set by writing the
<literal><collation></literal> element within a
- <literal><charset></literal> character set description.
- The procedure described here does not require recompiling MySQL.
- It uses a subset of the Locale Data Markup Language (LDML)
- specification, which is available at
+ <literal><charset></literal> character set description in
+ the MySQL <filename>Index.xml</filename> file. The procedure
+ described here does not require recompiling MySQL. It uses a
+ subset of the Locale Data Markup Language (LDML) specification,
+ which is available at
<ulink url="http://www.unicode.org/reports/tr35/"/>. In
¤t-series;, this method of adding collations is supported
as of MySQL 5.0.46. With this method, you need not define the
@@ -7538,6 +7539,10 @@
<title>LDML Syntax Supported in MySQL</title>
+ <indexterm>
+ <primary>LDML syntax</primary>
+ </indexterm>
+
<para>
This section describes the LDML syntax that MySQL recognizes.
This is a subset of the syntax described in the LDML
@@ -7613,7 +7618,7 @@
<para>
The <literal><p></literal>,
<literal><s></literal>, and
- <literal><t></literal>, shift rules define primary,
+ <literal><t></literal> shift rules define primary,
secondary, and tertiary differences of a character from
another character:
</para>
Modified: trunk/refman-5.1/globalization.xml
===================================================================
--- trunk/refman-5.1/globalization.xml 2011-05-24 16:10:18 UTC (rev 26325)
+++ trunk/refman-5.1/globalization.xml 2011-05-24 16:10:46 UTC (rev 26326)
Changed blocks: 4, Lines Added: 14, Lines Deleted: 9; 2728 bytes
@@ -7348,10 +7348,10 @@
This section describes how to add a simple collation for an
8-bit character set by writing the
<literal><collation></literal> elements associated with a
- <literal><charset></literal> character set description.
- The procedure described here does not require recompiling MySQL.
- The example adds a collation named
- <literal>latin1_test_ci</literal> to the
+ <literal><charset></literal> character set description in
+ the MySQL <filename>Index.xml</filename> file. The procedure
+ described here does not require recompiling MySQL. The example
+ adds a collation named <literal>latin1_test_ci</literal> to the
<literal>latin1</literal> character set.
</para>
@@ -7468,10 +7468,11 @@
This section describes how to add a UCA collation for a Unicode
character set by writing the
<literal><collation></literal> element within a
- <literal><charset></literal> character set description.
- The procedure described here does not require recompiling MySQL.
- It uses a subset of the Locale Data Markup Language (LDML)
- specification, which is available at
+ <literal><charset></literal> character set description in
+ the MySQL <filename>Index.xml</filename> file. The procedure
+ described here does not require recompiling MySQL. It uses a
+ subset of the Locale Data Markup Language (LDML) specification,
+ which is available at
<ulink url="http://www.unicode.org/reports/tr35/"/>. In
¤t-series;, this method of adding collations is supported
as of MySQL 5.1.20. With this method, you need not define the
@@ -7728,6 +7729,10 @@
<title>LDML Syntax Supported in MySQL</title>
+ <indexterm>
+ <primary>LDML syntax</primary>
+ </indexterm>
+
<para>
This section describes the LDML syntax that MySQL recognizes.
This is a subset of the syntax described in the LDML
@@ -7803,7 +7808,7 @@
<para>
The <literal><p></literal>,
<literal><s></literal>, and
- <literal><t></literal>, shift rules define primary,
+ <literal><t></literal> shift rules define primary,
secondary, and tertiary differences of a character from
another character:
</para>
Modified: trunk/refman-5.5/globalization.xml
===================================================================
--- trunk/refman-5.5/globalization.xml 2011-05-24 16:10:18 UTC (rev 26325)
+++ trunk/refman-5.5/globalization.xml 2011-05-24 16:10:46 UTC (rev 26326)
Changed blocks: 4, Lines Added: 14, Lines Deleted: 9; 2729 bytes
@@ -8578,10 +8578,10 @@
This section describes how to add a simple collation for an
8-bit character set by writing the
<literal><collation></literal> elements associated with a
- <literal><charset></literal> character set description.
- The procedure described here does not require recompiling MySQL.
- The example adds a collation named
- <literal>latin1_test_ci</literal> to the
+ <literal><charset></literal> character set description in
+ the MySQL <filename>Index.xml</filename> file. The procedure
+ described here does not require recompiling MySQL. The example
+ adds a collation named <literal>latin1_test_ci</literal> to the
<literal>latin1</literal> character set.
</para>
@@ -8698,10 +8698,11 @@
This section describes how to add a UCA collation for a Unicode
character set by writing the
<literal><collation></literal> element within a
- <literal><charset></literal> character set description.
- The procedure described here does not require recompiling MySQL.
- It uses a subset of the Locale Data Markup Language (LDML)
- specification, which is available at
+ <literal><charset></literal> character set description in
+ the MySQL <filename>Index.xml</filename> file. The procedure
+ described here does not require recompiling MySQL. It uses a
+ subset of the Locale Data Markup Language (LDML) specification,
+ which is available at
<ulink url="http://www.unicode.org/reports/tr35/"/>. With this
method, you need not define the entire collation. Instead, you
begin with an existing <quote>base</quote> collation and
@@ -8965,6 +8966,10 @@
<title>LDML Syntax Supported in MySQL</title>
+ <indexterm>
+ <primary>LDML syntax</primary>
+ </indexterm>
+
<para>
This section describes the LDML syntax that MySQL recognizes.
This is a subset of the syntax described in the LDML
@@ -9040,7 +9045,7 @@
<para>
The <literal><p></literal>,
<literal><s></literal>, and
- <literal><t></literal>, shift rules define primary,
+ <literal><t></literal> shift rules define primary,
secondary, and tertiary differences of a character from
another character:
</para>
Modified: trunk/refman-5.6/globalization.xml
===================================================================
--- trunk/refman-5.6/globalization.xml 2011-05-24 16:10:18 UTC (rev 26325)
+++ trunk/refman-5.6/globalization.xml 2011-05-24 16:10:46 UTC (rev 26326)
Changed blocks: 12, Lines Added: 80, Lines Deleted: 74; 9423 bytes
@@ -8837,10 +8837,10 @@
This section describes how to add a simple collation for an
8-bit character set by writing the
<literal><collation></literal> elements associated with a
- <literal><charset></literal> character set description.
- The procedure described here does not require recompiling MySQL.
- The example adds a collation named
- <literal>latin1_test_ci</literal> to the
+ <literal><charset></literal> character set description in
+ the MySQL <filename>Index.xml</filename> file. The procedure
+ described here does not require recompiling MySQL. The example
+ adds a collation named <literal>latin1_test_ci</literal> to the
<literal>latin1</literal> character set.
</para>
@@ -8957,10 +8957,11 @@
This section describes how to add a UCA collation for a Unicode
character set by writing the
<literal><collation></literal> element within a
- <literal><charset></literal> character set description.
- The procedure described here does not require recompiling MySQL.
- It uses a subset of the Locale Data Markup Language (LDML)
- specification, which is available at
+ <literal><charset></literal> character set description in
+ the MySQL <filename>Index.xml</filename> file. The procedure
+ described here does not require recompiling MySQL. It uses a
+ subset of the Locale Data Markup Language (LDML) specification,
+ which is available at
<ulink url="http://www.unicode.org/reports/tr35/"/>. With this
method, you need not define the entire collation. Instead, you
begin with an existing <quote>base</quote> collation and
@@ -9227,6 +9228,10 @@
<title>LDML Syntax Supported in MySQL</title>
+ <indexterm>
+ <primary>LDML syntax</primary>
+ </indexterm>
+
<para>
This section describes the LDML syntax that MySQL recognizes.
This is a subset of the syntax described in the LDML
@@ -9316,7 +9321,7 @@
<para>
The <literal><p></literal>,
<literal><s></literal>, and
- <literal><t></literal>, shift rules define primary,
+ <literal><t></literal> shift rules define primary,
secondary, and tertiary differences of a character from
another character:
</para>
@@ -9372,48 +9377,6 @@
<listitem>
<para>
- Reset rules permit a <literal>before</literal> attribute.
- Normally, shift rules after a reset rule indicate
- characters that sort after the reset character. Shift
- rules after a reset rule that has the
- <literal>before</literal> attribute indicate characters
- that sort before the reset character. The following rules
- put the character <literal>'b'</literal> immediately
- before <literal>'a'</literal> at the primary level:
- </para>
-
-<programlisting>
-<reset before="primary">a</reset>
-<p>b</p>
-</programlisting>
-
- <para>
- Permissible <literal>before</literal> attribute values
- specify the sort level by name or the equivalent numeric
- value:
- </para>
-
-<programlisting>
-<reset before="primary">
-<reset before="1">
-
-<reset before="secondary">
-<reset before="2">
-
-<reset before="tertiary">
-<reset before="3">
-</programlisting>
-
-<!--
-<programlisting>
-<reset before="quaternary">
-<reset before="4">
-</programlisting>
--->
- </listitem>
-
- <listitem>
- <para>
The <literal><i></literal> shift rule indicates that
one character sorts identically to another. The following
rules cause <literal>'b'</literal> to sort the same as
@@ -9475,9 +9438,9 @@
<listitem>
<para>
- MySQL supports expansions 2 to 6 characters long. An
- expansion is a reset rule that establishes an anchor point
- for a multiple-character sequence. The following rules put
+ An expansion is a reset rule that establishes an anchor
+ point for a multiple-character sequence. MySQL supports
+ expansions 2 to 6 characters long. The following rules put
<literal>'z'</literal> greater at the primary level than
the sequence of three characters <literal>'abc'</literal>:
</para>
@@ -9490,11 +9453,11 @@
<listitem>
<para>
- MySQL supports contractions 2 to 6 characters long. A
- contraction is a shift rule that sorts a
- multiple-character sequence. The following rules put the
- sequence of three characters <literal>'xyz'</literal>
- greater at the primary level than <literal>'a'</literal>:
+ A contraction is a shift rule that sorts a
+ multiple-character sequence. MySQL supports contractions 2
+ to 6 characters long. The following rules put the sequence
+ of three characters <literal>'xyz'</literal> greater at
+ the primary level than <literal>'a'</literal>:
</para>
<programlisting>
@@ -9560,7 +9523,8 @@
sorts. The following rules put <literal>'-'</literal>
greater at the secondary level than
<literal>'a'</literal>, but only when
- <literal>'-'</literal> goes after <literal>'b'</literal>:
+ <literal>'-'</literal> occurs after
+ <literal>'b'</literal>:
</para>
<programlisting>
@@ -9587,6 +9551,48 @@
<listitem>
<para>
+ Reset rules permit a <literal>before</literal> attribute.
+ Normally, shift rules after a reset rule indicate
+ characters that sort after the reset character. Shift
+ rules after a reset rule that has the
+ <literal>before</literal> attribute indicate characters
+ that sort before the reset character. The following rules
+ put the character <literal>'b'</literal> immediately
+ before <literal>'a'</literal> at the primary level:
+ </para>
+
+<programlisting>
+<reset before="primary">a</reset>
+<p>b</p>
+</programlisting>
+
+ <para>
+ Permissible <literal>before</literal> attribute values
+ specify the sort level by name or the equivalent numeric
+ value:
+ </para>
+
+<programlisting>
+<reset before="primary">
+<reset before="1">
+
+<reset before="secondary">
+<reset before="2">
+
+<reset before="tertiary">
+<reset before="3">
+</programlisting>
+
+<!--
+<programlisting>
+<reset before="quaternary">
+<reset before="4">
+</programlisting>
+-->
+ </listitem>
+
+ <listitem>
+ <para>
A reset rule can name a logical reset position rather than
a literal character:
</para>
@@ -9717,7 +9723,7 @@
<literal>simple</literal>: Calculate character weights
as for reset rules that do not have a
<literal>before</literal> attribute. This is the
- default.
+ default if the attribute is not given.
</para>
</listitem>
@@ -9837,6 +9843,19 @@
<listitem>
<para>
+ If collation initialization is not possible, the server
+ reports an <quote>Unknown collation</quote> error, and
+ also generates warnings explaining the problems, such as
+ in the previous example. In other cases, when a collation
+ description is generally correct but contains some unknown
+ tags, the collation is initialized and is available for
+ use. The unknown parts are ignored, but a warning is
+ generated in the error log.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
Problems with collations generate warnings that clients
can display with <literal role="stmt">SHOW
WARNINGS</literal>. Suppose that a reset rule contains an
@@ -9866,19 +9885,6 @@
</programlisting>
</listitem>
- <listitem>
- <para>
- If collation initialization is not possible, the server
- reports an <quote>Unknown collation</quote> error, and
- also generates warnings explaining the problems, such as
- in the previous example. In other cases, when a collation
- description is generally correct but contains some unknown
- tags, the collation is initialized and is available for
- use. The unknown parts are ignored, but a warning is
- generated in the error log.
- </para>
- </listitem>
-
</itemizedlist>
</section>
Modified: trunk/refman-6.0/globalization.xml
===================================================================
--- trunk/refman-6.0/globalization.xml 2011-05-24 16:10:18 UTC (rev 26325)
+++ trunk/refman-6.0/globalization.xml 2011-05-24 16:10:46 UTC (rev 26326)
Changed blocks: 4, Lines Added: 14, Lines Deleted: 9; 2727 bytes
@@ -9082,10 +9082,10 @@
This section describes how to add a simple collation for an
8-bit character set by writing the
<literal><collation></literal> elements associated with a
- <literal><charset></literal> character set description.
- The procedure described here does not require recompiling MySQL.
- The example adds a collation named
- <literal>latin1_test_ci</literal> to the
+ <literal><charset></literal> character set description in
+ the MySQL <filename>Index.xml</filename> file. The procedure
+ described here does not require recompiling MySQL. The example
+ adds a collation named <literal>latin1_test_ci</literal> to the
<literal>latin1</literal> character set.
</para>
@@ -9202,10 +9202,11 @@
This section describes how to add a UCA collation for a Unicode
character set by writing the
<literal><collation></literal> element within a
- <literal><charset></literal> character set description.
- The procedure described here does not require recompiling MySQL.
- It uses a subset of the Locale Data Markup Language (LDML)
- specification, which is available at
+ <literal><charset></literal> character set description in
+ the MySQL <filename>Index.xml</filename> file. The procedure
+ described here does not require recompiling MySQL. It uses a
+ subset of the Locale Data Markup Language (LDML) specification,
+ which is available at
<ulink url="http://www.unicode.org/reports/tr35/"/>. In
¤t-series;, this method of adding collations is supported
as of MySQL 6.0.4. With this method, you need not define the
@@ -9470,6 +9471,10 @@
<title>LDML Syntax Supported in MySQL</title>
+ <indexterm>
+ <primary>LDML syntax</primary>
+ </indexterm>
+
<para>
This section describes the LDML syntax that MySQL recognizes.
This is a subset of the syntax described in the LDML
@@ -9545,7 +9550,7 @@
<para>
The <literal><p></literal>,
<literal><s></literal>, and
- <literal><t></literal>, shift rules define primary,
+ <literal><t></literal> shift rules define primary,
secondary, and tertiary differences of a character from
another character:
</para>
| Thread |
|---|
| • svn commit - mysqldoc@oter02: r26326 - in trunk: . refman-5.0 refman-5.1 refman-5.5 refman-5.6 refman-6.0 | paul.dubois | 24 May |
