| List: | Commits | « Previous MessageNext Message » | |
| From: | paul | Date: | March 24 2006 8:02pm |
| Subject: | svn commit - mysqldoc@docsrva: r1662 - in trunk: . refman-4.1 refman-5.0 refman-5.1 | ||
| View as plain text | |||
Author: paul Date: 2006-03-24 20:02:49 +0100 (Fri, 24 Mar 2006) New Revision: 1662 Log: r4098@kite-hub: paul | 2006-03-24 11:56:32 -0600 Fold in proof corrections. Modified: trunk/ trunk/refman-4.1/charset.xml trunk/refman-5.0/charset.xml trunk/refman-5.1/charset.xml trunk/refman-5.1/database-administration.xml Property changes on: trunk ___________________________________________________________________ Name: svk:merge - b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:8925 bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:4095 + b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:8925 bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:4098 Modified: trunk/refman-4.1/charset.xml =================================================================== --- trunk/refman-4.1/charset.xml 2006-03-24 19:02:38 UTC (rev 1661) +++ trunk/refman-4.1/charset.xml 2006-03-24 19:02:49 UTC (rev 1662) @@ -678,7 +678,7 @@ <programlisting> <replaceable>col_name</replaceable> {CHAR | VARCHAR | TEXT} (<replaceable>col_length</replaceable>) - [CHARACTER SET <replaceable>charset_name</replaceable> [COLLATE <replaceable>collation_name</replaceable>]] + [CHARACTER SET <replaceable>charset_name</replaceable>] [COLLATE <replaceable>collation_name</replaceable>] </programlisting> <para> @@ -1696,7 +1696,7 @@ <title>&title-charset-collation-charset;</title> <para> - Cach character set has one or more collations, but each + Each character set has one or more collations, but each collation is associated with one and only one character set. Therefore, the following statement causes an error message because the <literal>latin2_bin</literal> collation is not legal @@ -1810,7 +1810,7 @@ </programlisting> <para> - And suppose that the column values are retrieved using the + Suppose also that the column values are retrieved using the following statement: </para> @@ -2002,10 +2002,10 @@ For example, with <literal>CASE ... WHEN a THEN b WHEN b THEN c COLLATE <replaceable>X</replaceable> END</literal>, the resulting collation is <replaceable>X</replaceable>. The same - applies for <literal>CASE</literal>, <literal>UNION</literal>, - <literal>||</literal>, <literal>CONCAT()</literal>, - <literal>ELT()</literal>, <literal>GREATEST()</literal>, - <literal>IF()</literal>, and <literal>LEAST()</literal>. + applies for <literal>UNION</literal>, <literal>||</literal>, + <literal>CONCAT()</literal>, <literal>ELT()</literal>, + <literal>GREATEST()</literal>, <literal>IF()</literal>, and + <literal>LEAST()</literal>. </para> <para> @@ -2374,10 +2374,10 @@ <para> The metadata requirements mean that the return values of the <literal>USER()</literal>, <literal>CURRENT_USER()</literal>, - <literal>DATABASE()</literal>, and <literal>VERSION()</literal> - functions have the UTF-8 character set by default, as do synonyms - such as <literal>SESSION_USER()</literal> and - <literal>SYSTEM_USER()</literal>. + <literal>SESSION_USER()</literal>, + <literal>SYSTEM_USER()</literal>, <literal>DATABASE()</literal>, + and <literal>VERSION()</literal> functions have the UTF-8 + character set by default. </para> <para> @@ -3361,8 +3361,9 @@ ‘<literal>o</literal>’. In addition, for traditional Spanish, ‘<literal>ch</literal>’ is a separate letter between ‘<literal>c</literal>’ and - <literal>d</literal>, and ‘<literal>ll</literal>’ is - a separate letter between ‘<literal>l</literal>’ and + ‘<literal>d</literal>’, and + ‘<literal>ll</literal>’ is a separate letter between + ‘<literal>l</literal>’ and ‘<literal>m</literal>’ </para> @@ -4606,189 +4607,187 @@ </itemizedlist> </listitem> - <listitem> - <para> - For some characters, conversion to and from - <literal>ucs2</literal> is different for - <literal>sjis</literal> and <literal>cp932</literal>. The - following tables illustrate these differences. - </para> + </itemizedlist> - <para> - Conversion to <literal>ucs2</literal>: - </para> + <para> + For some characters, conversion to and from + <literal>ucs2</literal> is different for + <literal>sjis</literal> and <literal>cp932</literal>. The + following tables illustrate these differences. + </para> - <informaltable> - <tgroup cols="3"> - <colspec colwidth="33*"/> - <colspec colwidth="33*"/> - <colspec colwidth="33*"/> - <tbody> - <row> - <entry><emphasis role="bold"><literal>sjis</literal>/<literal>cp932</literal> - Value</emphasis></entry> - <entry><emphasis role="bold"><literal>sjis</literal> -> - <literal>ucs2</literal> Conversion</emphasis></entry> - <entry><emphasis role="bold"><literal>cp932</literal> -> - <literal>ucs2</literal> Conversion</emphasis></entry> - </row> - <row> - <entry>5C</entry> - <entry>005C</entry> - <entry>005C</entry> - </row> - <row> - <entry>7E</entry> - <entry>007E</entry> - <entry>007E</entry> - </row> - <row> - <entry>815C</entry> - <entry>2015</entry> - <entry>2015</entry> - </row> - <row> - <entry>815F</entry> - <entry>005C</entry> - <entry>FF3C</entry> - </row> - <row> - <entry>8160</entry> - <entry>301C</entry> - <entry>FF5E</entry> - </row> - <row> - <entry>8161</entry> - <entry>2016</entry> - <entry>2225</entry> - </row> - <row> - <entry>817C</entry> - <entry>2212</entry> - <entry>FF0D</entry> - </row> - <row> - <entry>8191</entry> - <entry>00A2</entry> - <entry>FFE0</entry> - </row> - <row> - <entry>8192</entry> - <entry>00A3</entry> - <entry>FFE1</entry> - </row> - <row> - <entry>81CA</entry> - <entry>00AC</entry> - <entry>FFE2</entry> - </row> - </tbody> - </tgroup> - </informaltable> + <para> + Conversion to <literal>ucs2</literal>: + </para> - <para> - Conversion from <literal>ucs2</literal>: - </para> + <informaltable> + <tgroup cols="3"> + <colspec colwidth="33*"/> + <colspec colwidth="33*"/> + <colspec colwidth="33*"/> + <tbody> + <row> + <entry><emphasis role="bold"><literal>sjis</literal>/<literal>cp932</literal> + Value</emphasis></entry> + <entry><emphasis role="bold"><literal>sjis</literal> -> + <literal>ucs2</literal> Conversion</emphasis></entry> + <entry><emphasis role="bold"><literal>cp932</literal> -> + <literal>ucs2</literal> Conversion</emphasis></entry> + </row> + <row> + <entry>5C</entry> + <entry>005C</entry> + <entry>005C</entry> + </row> + <row> + <entry>7E</entry> + <entry>007E</entry> + <entry>007E</entry> + </row> + <row> + <entry>815C</entry> + <entry>2015</entry> + <entry>2015</entry> + </row> + <row> + <entry>815F</entry> + <entry>005C</entry> + <entry>FF3C</entry> + </row> + <row> + <entry>8160</entry> + <entry>301C</entry> + <entry>FF5E</entry> + </row> + <row> + <entry>8161</entry> + <entry>2016</entry> + <entry>2225</entry> + </row> + <row> + <entry>817C</entry> + <entry>2212</entry> + <entry>FF0D</entry> + </row> + <row> + <entry>8191</entry> + <entry>00A2</entry> + <entry>FFE0</entry> + </row> + <row> + <entry>8192</entry> + <entry>00A3</entry> + <entry>FFE1</entry> + </row> + <row> + <entry>81CA</entry> + <entry>00AC</entry> + <entry>FFE2</entry> + </row> + </tbody> + </tgroup> + </informaltable> - <informaltable> - <tgroup cols="3"> - <colspec colwidth="33*"/> - <colspec colwidth="33*"/> - <colspec colwidth="33*"/> - <tbody> - <row> - <entry><emphasis role="bold"><literal>ucs2</literal> value</emphasis></entry> - <entry><emphasis role="bold"><literal>ucs2</literal> -> - <literal>sjis</literal> Conversion</emphasis></entry> - <entry><emphasis role="bold"><literal>ucs2</literal> -> - <literal>cp932</literal> Conversion</emphasis></entry> - </row> - <row> - <entry>005C</entry> - <entry>815F</entry> - <entry>5C</entry> - </row> - <row> - <entry>007E</entry> - <entry>7E</entry> - <entry>7E</entry> - </row> - <row> - <entry>00A2</entry> - <entry>8191</entry> - <entry>3F</entry> - </row> - <row> - <entry>00A3</entry> - <entry>8192</entry> - <entry>3F</entry> - </row> - <row> - <entry>00AC</entry> - <entry>81CA</entry> - <entry>3F</entry> - </row> - <row> - <entry>2015</entry> - <entry>815C</entry> - <entry>815C</entry> - </row> - <row> - <entry>2016</entry> - <entry>8161</entry> - <entry>3F</entry> - </row> - <row> - <entry>2212</entry> - <entry>817C</entry> - <entry>3F</entry> - </row> - <row> - <entry>2225</entry> - <entry>3F</entry> - <entry>8161</entry> - </row> - <row> - <entry>301C</entry> - <entry>8160</entry> - <entry>3F</entry> - </row> - <row> - <entry>FF0D</entry> - <entry>3F</entry> - <entry>817C</entry> - </row> - <row> - <entry>FF3C</entry> - <entry>3F</entry> - <entry>815F</entry> - </row> - <row> - <entry>FF5E</entry> - <entry>3F</entry> - <entry>8160</entry> - </row> - <row> - <entry>FFE0</entry> - <entry>3F</entry> - <entry>8191</entry> - </row> - <row> - <entry>FFE1</entry> - <entry>3F</entry> - <entry>8192</entry> - </row> - <row> - <entry>FFE2</entry> - <entry>3F</entry> - <entry>81CA</entry> - </row> - </tbody> - </tgroup> - </informaltable> - </listitem> + <para> + Conversion from <literal>ucs2</literal>: + </para> - </itemizedlist> + <informaltable> + <tgroup cols="3"> + <colspec colwidth="33*"/> + <colspec colwidth="33*"/> + <colspec colwidth="33*"/> + <tbody> + <row> + <entry><emphasis role="bold"><literal>ucs2</literal> value</emphasis></entry> + <entry><emphasis role="bold"><literal>ucs2</literal> -> + <literal>sjis</literal> Conversion</emphasis></entry> + <entry><emphasis role="bold"><literal>ucs2</literal> -> + <literal>cp932</literal> Conversion</emphasis></entry> + </row> + <row> + <entry>005C</entry> + <entry>815F</entry> + <entry>5C</entry> + </row> + <row> + <entry>007E</entry> + <entry>7E</entry> + <entry>7E</entry> + </row> + <row> + <entry>00A2</entry> + <entry>8191</entry> + <entry>3F</entry> + </row> + <row> + <entry>00A3</entry> + <entry>8192</entry> + <entry>3F</entry> + </row> + <row> + <entry>00AC</entry> + <entry>81CA</entry> + <entry>3F</entry> + </row> + <row> + <entry>2015</entry> + <entry>815C</entry> + <entry>815C</entry> + </row> + <row> + <entry>2016</entry> + <entry>8161</entry> + <entry>3F</entry> + </row> + <row> + <entry>2212</entry> + <entry>817C</entry> + <entry>3F</entry> + </row> + <row> + <entry>2225</entry> + <entry>3F</entry> + <entry>8161</entry> + </row> + <row> + <entry>301C</entry> + <entry>8160</entry> + <entry>3F</entry> + </row> + <row> + <entry>FF0D</entry> + <entry>3F</entry> + <entry>817C</entry> + </row> + <row> + <entry>FF3C</entry> + <entry>3F</entry> + <entry>815F</entry> + </row> + <row> + <entry>FF5E</entry> + <entry>3F</entry> + <entry>8160</entry> + </row> + <row> + <entry>FFE0</entry> + <entry>3F</entry> + <entry>8191</entry> + </row> + <row> + <entry>FFE1</entry> + <entry>3F</entry> + <entry>8192</entry> + </row> + <row> + <entry>FFE2</entry> + <entry>3F</entry> + <entry>81CA</entry> + </row> + </tbody> + </tgroup> + </informaltable> <para> Users of any Japanese character sets should be aware that Modified: trunk/refman-5.0/charset.xml =================================================================== --- trunk/refman-5.0/charset.xml 2006-03-24 19:02:38 UTC (rev 1661) +++ trunk/refman-5.0/charset.xml 2006-03-24 19:02:49 UTC (rev 1662) @@ -671,7 +671,7 @@ <programlisting> <replaceable>col_name</replaceable> {CHAR | VARCHAR | TEXT} (<replaceable>col_length</replaceable>) - [CHARACTER SET <replaceable>charset_name</replaceable> [COLLATE <replaceable>collation_name</replaceable>]] + [CHARACTER SET <replaceable>charset_name</replaceable>] [COLLATE <replaceable>collation_name</replaceable>] </programlisting> <para> @@ -1613,8 +1613,10 @@ <para> The preceding coercibility values are current as of MySQL 5.0.3. - See the note later in this section for additional - version-related information. + In MySQL ¤t-series; prior to 5.0.3, there is no system + constant or ignorable coercibility. Functions such as + <literal>USER()</literal> have a coercibility of 2 rather than + 3, and literals have a coercibility of 3 rather than 4. </para> <para> @@ -1681,13 +1683,6 @@ See <xref linkend="information-functions"/>. </para> - <para> - In MySQL ¤t-series; prior to release 5.0.3, there is no - system constant or ignorable coercibility. Functions such as - <literal>USER()</literal> have a coercibility of 2 rather than - 3, and literals have a coercibility of 3 rather than 4. - </para> - </section> <section id="charset-collation-charset"> @@ -1695,7 +1690,7 @@ <title>&title-charset-collation-charset;</title> <para> - Cach character set has one or more collations, but each + Each character set has one or more collations, but each collation is associated with one and only one character set. Therefore, the following statement causes an error message because the <literal>latin2_bin</literal> collation is not legal @@ -1728,7 +1723,7 @@ </programlisting> <para> - And suppose that the column values are retrieved using the + Suppose also that the column values are retrieved using the following statement: </para> @@ -1920,10 +1915,10 @@ For example, with <literal>CASE ... WHEN a THEN b WHEN b THEN c COLLATE <replaceable>X</replaceable> END</literal>, the resulting collation is <replaceable>X</replaceable>. The same - applies for <literal>CASE</literal>, <literal>UNION</literal>, - <literal>||</literal>, <literal>CONCAT()</literal>, - <literal>ELT()</literal>, <literal>GREATEST()</literal>, - <literal>IF()</literal>, and <literal>LEAST()</literal>. + applies for <literal>UNION</literal>, <literal>||</literal>, + <literal>CONCAT()</literal>, <literal>ELT()</literal>, + <literal>GREATEST()</literal>, <literal>IF()</literal>, and + <literal>LEAST()</literal>. </para> <para> @@ -2307,10 +2302,10 @@ <para> The metadata requirements mean that the return values of the <literal>USER()</literal>, <literal>CURRENT_USER()</literal>, - <literal>DATABASE()</literal>, and <literal>VERSION()</literal> - functions have the UTF-8 character set by default, as do synonyms - such as <literal>SESSION_USER()</literal> and - <literal>SYSTEM_USER()</literal>. + <literal>SESSION_USER()</literal>, + <literal>SYSTEM_USER()</literal>, <literal>DATABASE()</literal>, + and <literal>VERSION()</literal> functions have the UTF-8 + character set by default. </para> <para> @@ -2887,8 +2882,9 @@ ‘<literal>o</literal>’. In addition, for traditional Spanish, ‘<literal>ch</literal>’ is a separate letter between ‘<literal>c</literal>’ and - <literal>d</literal>, and ‘<literal>ll</literal>’ is - a separate letter between ‘<literal>l</literal>’ and + ‘<literal>d</literal>’, and + ‘<literal>ll</literal>’ is a separate letter between + ‘<literal>l</literal>’ and ‘<literal>m</literal>’ </para> @@ -4141,189 +4137,187 @@ </para> </listitem> - <listitem> - <para> - For some characters, conversion to and from - <literal>ucs2</literal> is different for - <literal>sjis</literal> and <literal>cp932</literal>. The - following tables illustrate these differences. - </para> + </itemizedlist> - <para> - Conversion to <literal>ucs2</literal>: - </para> + <para> + For some characters, conversion to and from + <literal>ucs2</literal> is different for + <literal>sjis</literal> and <literal>cp932</literal>. The + following tables illustrate these differences. + </para> - <informaltable> - <tgroup cols="3"> - <colspec colwidth="33*"/> - <colspec colwidth="33*"/> - <colspec colwidth="33*"/> - <tbody> - <row> - <entry><emphasis role="bold"><literal>sjis</literal>/<literal>cp932</literal> - Value</emphasis></entry> - <entry><emphasis role="bold"><literal>sjis</literal> -> - <literal>ucs2</literal> Conversion</emphasis></entry> - <entry><emphasis role="bold"><literal>cp932</literal> -> - <literal>ucs2</literal> Conversion</emphasis></entry> - </row> - <row> - <entry>5C</entry> - <entry>005C</entry> - <entry>005C</entry> - </row> - <row> - <entry>7E</entry> - <entry>007E</entry> - <entry>007E</entry> - </row> - <row> - <entry>815C</entry> - <entry>2015</entry> - <entry>2015</entry> - </row> - <row> - <entry>815F</entry> - <entry>005C</entry> - <entry>FF3C</entry> - </row> - <row> - <entry>8160</entry> - <entry>301C</entry> - <entry>FF5E</entry> - </row> - <row> - <entry>8161</entry> - <entry>2016</entry> - <entry>2225</entry> - </row> - <row> - <entry>817C</entry> - <entry>2212</entry> - <entry>FF0D</entry> - </row> - <row> - <entry>8191</entry> - <entry>00A2</entry> - <entry>FFE0</entry> - </row> - <row> - <entry>8192</entry> - <entry>00A3</entry> - <entry>FFE1</entry> - </row> - <row> - <entry>81CA</entry> - <entry>00AC</entry> - <entry>FFE2</entry> - </row> - </tbody> - </tgroup> - </informaltable> + <para> + Conversion to <literal>ucs2</literal>: + </para> - <para> - Conversion from <literal>ucs2</literal>: - </para> + <informaltable> + <tgroup cols="3"> + <colspec colwidth="33*"/> + <colspec colwidth="33*"/> + <colspec colwidth="33*"/> + <tbody> + <row> + <entry><emphasis role="bold"><literal>sjis</literal>/<literal>cp932</literal> + Value</emphasis></entry> + <entry><emphasis role="bold"><literal>sjis</literal> -> + <literal>ucs2</literal> Conversion</emphasis></entry> + <entry><emphasis role="bold"><literal>cp932</literal> -> + <literal>ucs2</literal> Conversion</emphasis></entry> + </row> + <row> + <entry>5C</entry> + <entry>005C</entry> + <entry>005C</entry> + </row> + <row> + <entry>7E</entry> + <entry>007E</entry> + <entry>007E</entry> + </row> + <row> + <entry>815C</entry> + <entry>2015</entry> + <entry>2015</entry> + </row> + <row> + <entry>815F</entry> + <entry>005C</entry> + <entry>FF3C</entry> + </row> + <row> + <entry>8160</entry> + <entry>301C</entry> + <entry>FF5E</entry> + </row> + <row> + <entry>8161</entry> + <entry>2016</entry> + <entry>2225</entry> + </row> + <row> + <entry>817C</entry> + <entry>2212</entry> + <entry>FF0D</entry> + </row> + <row> + <entry>8191</entry> + <entry>00A2</entry> + <entry>FFE0</entry> + </row> + <row> + <entry>8192</entry> + <entry>00A3</entry> + <entry>FFE1</entry> + </row> + <row> + <entry>81CA</entry> + <entry>00AC</entry> + <entry>FFE2</entry> + </row> + </tbody> + </tgroup> + </informaltable> - <informaltable> - <tgroup cols="3"> - <colspec colwidth="33*"/> - <colspec colwidth="33*"/> - <colspec colwidth="33*"/> - <tbody> - <row> - <entry><emphasis role="bold"><literal>ucs2</literal> value</emphasis></entry> - <entry><emphasis role="bold"><literal>ucs2</literal> -> - <literal>sjis</literal> Conversion</emphasis></entry> - <entry><emphasis role="bold"><literal>ucs2</literal> -> - <literal>cp932</literal> Conversion</emphasis></entry> - </row> - <row> - <entry>005C</entry> - <entry>815F</entry> - <entry>5C</entry> - </row> - <row> - <entry>007E</entry> - <entry>7E</entry> - <entry>7E</entry> - </row> - <row> - <entry>00A2</entry> - <entry>8191</entry> - <entry>3F</entry> - </row> - <row> - <entry>00A3</entry> - <entry>8192</entry> - <entry>3F</entry> - </row> - <row> - <entry>00AC</entry> - <entry>81CA</entry> - <entry>3F</entry> - </row> - <row> - <entry>2015</entry> - <entry>815C</entry> - <entry>815C</entry> - </row> - <row> - <entry>2016</entry> - <entry>8161</entry> - <entry>3F</entry> - </row> - <row> - <entry>2212</entry> - <entry>817C</entry> - <entry>3F</entry> - </row> - <row> - <entry>2225</entry> - <entry>3F</entry> - <entry>8161</entry> - </row> - <row> - <entry>301C</entry> - <entry>8160</entry> - <entry>3F</entry> - </row> - <row> - <entry>FF0D</entry> - <entry>3F</entry> - <entry>817C</entry> - </row> - <row> - <entry>FF3C</entry> - <entry>3F</entry> - <entry>815F</entry> - </row> - <row> - <entry>FF5E</entry> - <entry>3F</entry> - <entry>8160</entry> - </row> - <row> - <entry>FFE0</entry> - <entry>3F</entry> - <entry>8191</entry> - </row> - <row> - <entry>FFE1</entry> - <entry>3F</entry> - <entry>8192</entry> - </row> - <row> - <entry>FFE2</entry> - <entry>3F</entry> - <entry>81CA</entry> - </row> - </tbody> - </tgroup> - </informaltable> - </listitem> + <para> + Conversion from <literal>ucs2</literal>: + </para> - </itemizedlist> + <informaltable> + <tgroup cols="3"> + <colspec colwidth="33*"/> + <colspec colwidth="33*"/> + <colspec colwidth="33*"/> + <tbody> + <row> + <entry><emphasis role="bold"><literal>ucs2</literal> value</emphasis></entry> + <entry><emphasis role="bold"><literal>ucs2</literal> -> + <literal>sjis</literal> Conversion</emphasis></entry> + <entry><emphasis role="bold"><literal>ucs2</literal> -> + <literal>cp932</literal> Conversion</emphasis></entry> + </row> + <row> + <entry>005C</entry> + <entry>815F</entry> + <entry>5C</entry> + </row> + <row> + <entry>007E</entry> + <entry>7E</entry> + <entry>7E</entry> + </row> + <row> + <entry>00A2</entry> + <entry>8191</entry> + <entry>3F</entry> + </row> + <row> + <entry>00A3</entry> + <entry>8192</entry> + <entry>3F</entry> + </row> + <row> + <entry>00AC</entry> + <entry>81CA</entry> + <entry>3F</entry> + </row> + <row> + <entry>2015</entry> + <entry>815C</entry> + <entry>815C</entry> + </row> + <row> + <entry>2016</entry> + <entry>8161</entry> + <entry>3F</entry> + </row> + <row> + <entry>2212</entry> + <entry>817C</entry> + <entry>3F</entry> + </row> + <row> + <entry>2225</entry> + <entry>3F</entry> + <entry>8161</entry> + </row> + <row> + <entry>301C</entry> + <entry>8160</entry> + <entry>3F</entry> + </row> + <row> + <entry>FF0D</entry> + <entry>3F</entry> + <entry>817C</entry> + </row> + <row> + <entry>FF3C</entry> + <entry>3F</entry> + <entry>815F</entry> + </row> + <row> + <entry>FF5E</entry> + <entry>3F</entry> + <entry>8160</entry> + </row> + <row> + <entry>FFE0</entry> + <entry>3F</entry> + <entry>8191</entry> + </row> + <row> + <entry>FFE1</entry> + <entry>3F</entry> + <entry>8192</entry> + </row> + <row> + <entry>FFE2</entry> + <entry>3F</entry> + <entry>81CA</entry> + </row> + </tbody> + </tgroup> + </informaltable> <para> Users of any Japanese character sets should be aware that Modified: trunk/refman-5.1/charset.xml =================================================================== --- trunk/refman-5.1/charset.xml 2006-03-24 19:02:38 UTC (rev 1661) +++ trunk/refman-5.1/charset.xml 2006-03-24 19:02:49 UTC (rev 1662) @@ -671,7 +671,7 @@ <programlisting> <replaceable>col_name</replaceable> {CHAR | VARCHAR | TEXT} (<replaceable>col_length</replaceable>) - [CHARACTER SET <replaceable>charset_name</replaceable> [COLLATE <replaceable>collation_name</replaceable>]] + [CHARACTER SET <replaceable>charset_name</replaceable>] [COLLATE <replaceable>collation_name</replaceable>] </programlisting> <para> @@ -1687,7 +1687,7 @@ <title>&title-charset-collation-charset;</title> <para> - Cach character set has one or more collations, but each + Each character set has one or more collations, but each collation is associated with one and only one character set. Therefore, the following statement causes an error message because the <literal>latin2_bin</literal> collation is not legal @@ -1720,7 +1720,7 @@ </programlisting> <para> - And suppose that the column values are retrieved using the + Suppose also that the column values are retrieved using the following statement: </para> @@ -1912,10 +1912,10 @@ For example, with <literal>CASE ... WHEN a THEN b WHEN b THEN c COLLATE <replaceable>X</replaceable> END</literal>, the resulting collation is <replaceable>X</replaceable>. The same - applies for <literal>CASE</literal>, <literal>UNION</literal>, - <literal>||</literal>, <literal>CONCAT()</literal>, - <literal>ELT()</literal>, <literal>GREATEST()</literal>, - <literal>IF()</literal>, and <literal>LEAST()</literal>. + applies for <literal>UNION</literal>, <literal>||</literal>, + <literal>CONCAT()</literal>, <literal>ELT()</literal>, + <literal>GREATEST()</literal>, <literal>IF()</literal>, and + <literal>LEAST()</literal>. </para> <para> @@ -2299,10 +2299,10 @@ <para> The metadata requirements mean that the return values of the <literal>USER()</literal>, <literal>CURRENT_USER()</literal>, - <literal>DATABASE()</literal>, and <literal>VERSION()</literal> - functions have the UTF-8 character set by default, as do synonyms - such as <literal>SESSION_USER()</literal> and - <literal>SYSTEM_USER()</literal>. + <literal>SESSION_USER()</literal>, + <literal>SYSTEM_USER()</literal>, <literal>DATABASE()</literal>, + and <literal>VERSION()</literal> functions have the UTF-8 + character set by default. </para> <para> @@ -2877,8 +2877,9 @@ ‘<literal>o</literal>’. In addition, for traditional Spanish, ‘<literal>ch</literal>’ is a separate letter between ‘<literal>c</literal>’ and - <literal>d</literal>, and ‘<literal>ll</literal>’ is - a separate letter between ‘<literal>l</literal>’ and + ‘<literal>d</literal>’, and + ‘<literal>ll</literal>’ is a separate letter between + ‘<literal>l</literal>’ and ‘<literal>m</literal>’ </para> @@ -4136,189 +4137,187 @@ </para> </listitem> - <listitem> - <para> - For some characters, conversion to and from - <literal>ucs2</literal> is different for - <literal>sjis</literal> and <literal>cp932</literal>. The - following tables illustrate these differences. - </para> + </itemizedlist> - <para> - Conversion to <literal>ucs2</literal>: - </para> + <para> + For some characters, conversion to and from + <literal>ucs2</literal> is different for + <literal>sjis</literal> and <literal>cp932</literal>. The + following tables illustrate these differences. + </para> - <informaltable> - <tgroup cols="3"> - <colspec colwidth="33*"/> - <colspec colwidth="33*"/> - <colspec colwidth="33*"/> - <tbody> - <row> - <entry><emphasis role="bold"><literal>sjis</literal>/<literal>cp932</literal> - Value</emphasis></entry> - <entry><emphasis role="bold"><literal>sjis</literal> -> - <literal>ucs2</literal> Conversion</emphasis></entry> - <entry><emphasis role="bold"><literal>cp932</literal> -> - <literal>ucs2</literal> Conversion</emphasis></entry> - </row> - <row> - <entry>5C</entry> - <entry>005C</entry> - <entry>005C</entry> - </row> - <row> - <entry>7E</entry> - <entry>007E</entry> - <entry>007E</entry> - </row> - <row> - <entry>815C</entry> - <entry>2015</entry> - <entry>2015</entry> - </row> - <row> - <entry>815F</entry> - <entry>005C</entry> - <entry>FF3C</entry> - </row> - <row> - <entry>8160</entry> - <entry>301C</entry> - <entry>FF5E</entry> - </row> - <row> - <entry>8161</entry> - <entry>2016</entry> - <entry>2225</entry> - </row> - <row> - <entry>817C</entry> - <entry>2212</entry> - <entry>FF0D</entry> - </row> - <row> - <entry>8191</entry> - <entry>00A2</entry> - <entry>FFE0</entry> - </row> - <row> - <entry>8192</entry> - <entry>00A3</entry> - <entry>FFE1</entry> - </row> - <row> - <entry>81CA</entry> - <entry>00AC</entry> - <entry>FFE2</entry> - </row> - </tbody> - </tgroup> - </informaltable> + <para> + Conversion to <literal>ucs2</literal>: + </para> - <para> - Conversion from <literal>ucs2</literal>: - </para> + <informaltable> + <tgroup cols="3"> + <colspec colwidth="33*"/> + <colspec colwidth="33*"/> + <colspec colwidth="33*"/> + <tbody> + <row> + <entry><emphasis role="bold"><literal>sjis</literal>/<literal>cp932</literal> + Value</emphasis></entry> + <entry><emphasis role="bold"><literal>sjis</literal> -> + <literal>ucs2</literal> Conversion</emphasis></entry> + <entry><emphasis role="bold"><literal>cp932</literal> -> + <literal>ucs2</literal> Conversion</emphasis></entry> + </row> + <row> + <entry>5C</entry> + <entry>005C</entry> + <entry>005C</entry> + </row> + <row> + <entry>7E</entry> + <entry>007E</entry> + <entry>007E</entry> + </row> + <row> + <entry>815C</entry> + <entry>2015</entry> + <entry>2015</entry> + </row> + <row> + <entry>815F</entry> + <entry>005C</entry> + <entry>FF3C</entry> + </row> + <row> + <entry>8160</entry> + <entry>301C</entry> + <entry>FF5E</entry> + </row> + <row> + <entry>8161</entry> + <entry>2016</entry> + <entry>2225</entry> + </row> + <row> + <entry>817C</entry> + <entry>2212</entry> + <entry>FF0D</entry> + </row> + <row> + <entry>8191</entry> + <entry>00A2</entry> + <entry>FFE0</entry> + </row> + <row> + <entry>8192</entry> + <entry>00A3</entry> + <entry>FFE1</entry> + </row> + <row> + <entry>81CA</entry> + <entry>00AC</entry> + <entry>FFE2</entry> + </row> + </tbody> + </tgroup> + </informaltable> - <informaltable> - <tgroup cols="3"> - <colspec colwidth="33*"/> - <colspec colwidth="33*"/> - <colspec colwidth="33*"/> - <tbody> - <row> - <entry><emphasis role="bold"><literal>ucs2</literal> value</emphasis></entry> - <entry><emphasis role="bold"><literal>ucs2</literal> -> - <literal>sjis</literal> Conversion</emphasis></entry> - <entry><emphasis role="bold"><literal>ucs2</literal> -> - <literal>cp932</literal> Conversion</emphasis></entry> - </row> - <row> - <entry>005C</entry> - <entry>815F</entry> - <entry>5C</entry> - </row> - <row> - <entry>007E</entry> - <entry>7E</entry> - <entry>7E</entry> - </row> - <row> - <entry>00A2</entry> - <entry>8191</entry> - <entry>3F</entry> - </row> - <row> - <entry>00A3</entry> - <entry>8192</entry> - <entry>3F</entry> - </row> - <row> - <entry>00AC</entry> - <entry>81CA</entry> - <entry>3F</entry> - </row> - <row> - <entry>2015</entry> - <entry>815C</entry> - <entry>815C</entry> - </row> - <row> - <entry>2016</entry> - <entry>8161</entry> - <entry>3F</entry> - </row> - <row> - <entry>2212</entry> - <entry>817C</entry> - <entry>3F</entry> - </row> - <row> - <entry>2225</entry> - <entry>3F</entry> - <entry>8161</entry> - </row> - <row> - <entry>301C</entry> - <entry>8160</entry> - <entry>3F</entry> - </row> - <row> - <entry>FF0D</entry> - <entry>3F</entry> - <entry>817C</entry> - </row> - <row> - <entry>FF3C</entry> - <entry>3F</entry> - <entry>815F</entry> - </row> - <row> - <entry>FF5E</entry> - <entry>3F</entry> - <entry>8160</entry> - </row> - <row> - <entry>FFE0</entry> - <entry>3F</entry> - <entry>8191</entry> - </row> - <row> - <entry>FFE1</entry> - <entry>3F</entry> - <entry>8192</entry> - </row> - <row> - <entry>FFE2</entry> - <entry>3F</entry> - <entry>81CA</entry> - </row> - </tbody> - </tgroup> - </informaltable> - </listitem> + <para> + Conversion from <literal>ucs2</literal>: + </para> - </itemizedlist> + <informaltable> + <tgroup cols="3"> + <colspec colwidth="33*"/> + <colspec colwidth="33*"/> + <colspec colwidth="33*"/> + <tbody> + <row> + <entry><emphasis role="bold"><literal>ucs2</literal> value</emphasis></entry> + <entry><emphasis role="bold"><literal>ucs2</literal> -> + <literal>sjis</literal> Conversion</emphasis></entry> + <entry><emphasis role="bold"><literal>ucs2</literal> -> + <literal>cp932</literal> Conversion</emphasis></entry> + </row> + <row> + <entry>005C</entry> + <entry>815F</entry> + <entry>5C</entry> + </row> + <row> + <entry>007E</entry> + <entry>7E</entry> + <entry>7E</entry> + </row> + <row> + <entry>00A2</entry> + <entry>8191</entry> + <entry>3F</entry> + </row> + <row> + <entry>00A3</entry> + <entry>8192</entry> + <entry>3F</entry> + </row> + <row> + <entry>00AC</entry> + <entry>81CA</entry> + <entry>3F</entry> + </row> + <row> + <entry>2015</entry> + <entry>815C</entry> + <entry>815C</entry> + </row> + <row> + <entry>2016</entry> + <entry>8161</entry> + <entry>3F</entry> + </row> + <row> + <entry>2212</entry> + <entry>817C</entry> + <entry>3F</entry> + </row> + <row> + <entry>2225</entry> + <entry>3F</entry> + <entry>8161</entry> + </row> + <row> + <entry>301C</entry> + <entry>8160</entry> + <entry>3F</entry> + </row> + <row> + <entry>FF0D</entry> + <entry>3F</entry> + <entry>817C</entry> + </row> + <row> + <entry>FF3C</entry> + <entry>3F</entry> + <entry>815F</entry> + </row> + <row> + <entry>FF5E</entry> + <entry>3F</entry> + <entry>8160</entry> + </row> + <row> + <entry>FFE0</entry> + <entry>3F</entry> + <entry>8191</entry> + </row> + <row> + <entry>FFE1</entry> + <entry>3F</entry> + <entry>8192</entry> + </row> + <row> + <entry>FFE2</entry> + <entry>3F</entry> + <entry>81CA</entry> + </row> + </tbody> + </tgroup> + </informaltable> <para> Users of any Japanese character sets should be aware that Modified: trunk/refman-5.1/database-administration.xml =================================================================== --- trunk/refman-5.1/database-administration.xml 2006-03-24 19:02:38 UTC (rev 1661) +++ trunk/refman-5.1/database-administration.xml 2006-03-24 19:02:49 UTC (rev 1662) @@ -19750,7 +19750,7 @@ programs such as <command>ps</command> that may be invoked by other users to display command lines. MySQL clients typically overwrite the command-line password argument with - zeros during their initialization sequence. However, there + zeroes during their initialization sequence. However, there is still a brief interval during which the value is visible. On some systems this strategy is ineffective, anyway, and the password remains visible to <command>ps</command>.
| Thread | ||
|---|---|---|
| • svn commit - mysqldoc@docsrva: r1662 - in trunk: . refman-4.1 refman-5.0 refman-5.1 | paul | 24 Mar |
© 1995-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
Page generated in 1.075 sec. using MySQL 5.1.14-beta-log