| List: | Commits | « Previous MessageNext Message » | |
| From: | paul | Date: | August 27 2007 3:55pm |
| Subject: | svn commit - mysqldoc@docsrva: r7557 - in trunk: . refman-5.0 refman-5.1 refman-5.2 | ||
| View as plain text | |||
Author: paul Date: 2007-08-27 15:55:57 +0200 (Mon, 27 Aug 2007) New Revision: 7557 Log: r24302@frost: paul | 2007-08-27 08:54:15 -0500 Incorporate final feedback from Bar on string repertoire. Modified: trunk/refman-5.0/charset.xml trunk/refman-5.1/charset.xml trunk/refman-5.2/charset.xml Property changes on: trunk ___________________________________________________________________ Name: svk:merge - 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:29492 7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:24294 b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218 bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:19696 + 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:29492 7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:24302 b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218 bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:19696 Modified: trunk/refman-5.0/charset.xml =================================================================== --- trunk/refman-5.0/charset.xml 2007-08-26 20:58:55 UTC (rev 7556) +++ trunk/refman-5.0/charset.xml 2007-08-27 13:55:57 UTC (rev 7557) Changed blocks: 6, Lines Added: 16, Lines Deleted: 12; 3267 bytes @@ -1995,8 +1995,8 @@ </para> <para> - Suppose that you have three tables that differ only by the character - set and collation used: + Suppose that you have three tables that differ only by the + character set and collation used: </para> <programlisting> @@ -2054,7 +2054,7 @@ <para> This is not a bug but rather a consequence of the sorting that <literal>latin1_german1_ci</literal> or - <literal>utf8_unicode_ci</literal> do (the sorting shown is done + <literal>utf8_unicode_ci</literal> do (the sorting shown is done according to the German DIN 5007 standard). </para> @@ -2083,7 +2083,7 @@ <listitem> <para> - <literal>UNICODE</literal>: The expression can contain only + <literal>UNICODE</literal>: The expression can contain characters in the Unicode range <literal>U+0000</literal> to <literal>U+FFFF</literal>. </para> @@ -2096,10 +2096,14 @@ <literal>UNICODE</literal> range, so a string with <literal>ASCII</literal> repertoire can be converted safely without loss of information to the character set of any string - with <literal>UNICODE</literal> repertoire. The use of repertoire - enables character set conversion in expressions for many cases - where MySQL would otherwise return an <quote>illegal mix of - collations</quote> error. + with <literal>UNICODE</literal> repertoire or to a character set + that is a superset of <literal>ASCII</literal>. (All MySQL + character sets are supersets of <literal>ASCII</literal> with the + exception of <literal>swe7</literal>, which reuses some + punctuation characters for Swedish accented characters.) The use + of repertoire enables character set conversion in expressions for + many cases where MySQL would otherwise return an <quote>illegal + mix of collations</quote> error. </para> <para> @@ -2244,7 +2248,7 @@ <para> Functions with two or more string arguments use the <quote>widest</quote> argument repertoire for the result - repetoire (<literal>UNICODE</literal> is wider than + repertoire (<literal>UNICODE</literal> is wider than <literal>ASCII</literal>). Consider the following <literal>CONCAT()</literal> calls: </para> @@ -3750,9 +3754,9 @@ <foreignphrase>Deutsches Institut für Normung</foreignphrase> (the German equivalent of ANSI). DIN-1 is called the <quote>dictionary collation</quote> and - DIN-2 is called the <quote>phone book collation.</quote> - For an example of the effect this has in comparisons or when - doing searches, see + DIN-2 is called the <quote>phone book collation.</quote> For + an example of the effect this has in comparisons or when + doing searches, see <xref linkend="charset-collation-effect"/>. </para> Modified: trunk/refman-5.1/charset.xml =================================================================== --- trunk/refman-5.1/charset.xml 2007-08-26 20:58:55 UTC (rev 7556) +++ trunk/refman-5.1/charset.xml 2007-08-27 13:55:57 UTC (rev 7557) Changed blocks: 6, Lines Added: 16, Lines Deleted: 12; 3267 bytes @@ -1992,8 +1992,8 @@ </para> <para> - Suppose that you have three tables that differ only by the character - set and collation used: + Suppose that you have three tables that differ only by the + character set and collation used: </para> <programlisting> @@ -2051,7 +2051,7 @@ <para> This is not a bug but rather a consequence of the sorting that <literal>latin1_german1_ci</literal> or - <literal>utf8_unicode_ci</literal> do (the sorting shown is done + <literal>utf8_unicode_ci</literal> do (the sorting shown is done according to the German DIN 5007 standard). </para> @@ -2080,7 +2080,7 @@ <listitem> <para> - <literal>UNICODE</literal>: The expression can contain only + <literal>UNICODE</literal>: The expression can contain characters in the Unicode range <literal>U+0000</literal> to <literal>U+FFFF</literal>. </para> @@ -2093,10 +2093,14 @@ <literal>UNICODE</literal> range, so a string with <literal>ASCII</literal> repertoire can be converted safely without loss of information to the character set of any string - with <literal>UNICODE</literal> repertoire. The use of repertoire - enables character set conversion in expressions for many cases - where MySQL would otherwise return an <quote>illegal mix of - collations</quote> error. + with <literal>UNICODE</literal> repertoire or to a character set + that is a superset of <literal>ASCII</literal>. (All MySQL + character sets are supersets of <literal>ASCII</literal> with the + exception of <literal>swe7</literal>, which reuses some + punctuation characters for Swedish accented characters.) The use + of repertoire enables character set conversion in expressions for + many cases where MySQL would otherwise return an <quote>illegal + mix of collations</quote> error. </para> <para> @@ -2241,7 +2245,7 @@ <para> Functions with two or more string arguments use the <quote>widest</quote> argument repertoire for the result - repetoire (<literal>UNICODE</literal> is wider than + repertoire (<literal>UNICODE</literal> is wider than <literal>ASCII</literal>). Consider the following <literal>CONCAT()</literal> calls: </para> @@ -3747,9 +3751,9 @@ <foreignphrase>Deutsches Institut für Normung</foreignphrase> (the German equivalent of ANSI). DIN-1 is called the <quote>dictionary collation</quote> and - DIN-2 is called the <quote>phone book collation.</quote> - For an example of the effect this has in comparisons or when - doing searches, see + DIN-2 is called the <quote>phone book collation.</quote> For + an example of the effect this has in comparisons or when + doing searches, see <xref linkend="charset-collation-effect"/>. </para> Modified: trunk/refman-5.2/charset.xml =================================================================== --- trunk/refman-5.2/charset.xml 2007-08-26 20:58:55 UTC (rev 7556) +++ trunk/refman-5.2/charset.xml 2007-08-27 13:55:57 UTC (rev 7557) Changed blocks: 6, Lines Added: 16, Lines Deleted: 12; 3267 bytes @@ -1992,8 +1992,8 @@ </para> <para> - Suppose that you have three tables that differ only by the character - set and collation used: + Suppose that you have three tables that differ only by the + character set and collation used: </para> <programlisting> @@ -2051,7 +2051,7 @@ <para> This is not a bug but rather a consequence of the sorting that <literal>latin1_german1_ci</literal> or - <literal>utf8_unicode_ci</literal> do (the sorting shown is done + <literal>utf8_unicode_ci</literal> do (the sorting shown is done according to the German DIN 5007 standard). </para> @@ -2080,7 +2080,7 @@ <listitem> <para> - <literal>UNICODE</literal>: The expression can contain only + <literal>UNICODE</literal>: The expression can contain characters in the Unicode range <literal>U+0000</literal> to <literal>U+FFFF</literal>. </para> @@ -2093,10 +2093,14 @@ <literal>UNICODE</literal> range, so a string with <literal>ASCII</literal> repertoire can be converted safely without loss of information to the character set of any string - with <literal>UNICODE</literal> repertoire. The use of repertoire - enables character set conversion in expressions for many cases - where MySQL would otherwise return an <quote>illegal mix of - collations</quote> error. + with <literal>UNICODE</literal> repertoire or to a character set + that is a superset of <literal>ASCII</literal>. (All MySQL + character sets are supersets of <literal>ASCII</literal> with the + exception of <literal>swe7</literal>, which reuses some + punctuation characters for Swedish accented characters.) The use + of repertoire enables character set conversion in expressions for + many cases where MySQL would otherwise return an <quote>illegal + mix of collations</quote> error. </para> <para> @@ -2241,7 +2245,7 @@ <para> Functions with two or more string arguments use the <quote>widest</quote> argument repertoire for the result - repetoire (<literal>UNICODE</literal> is wider than + repertoire (<literal>UNICODE</literal> is wider than <literal>ASCII</literal>). Consider the following <literal>CONCAT()</literal> calls: </para> @@ -3747,9 +3751,9 @@ <foreignphrase>Deutsches Institut für Normung</foreignphrase> (the German equivalent of ANSI). DIN-1 is called the <quote>dictionary collation</quote> and - DIN-2 is called the <quote>phone book collation.</quote> - For an example of the effect this has in comparisons or when - doing searches, see + DIN-2 is called the <quote>phone book collation.</quote> For + an example of the effect this has in comparisons or when + doing searches, see <xref linkend="charset-collation-effect"/>. </para>
| Thread | ||
|---|---|---|
| • svn commit - mysqldoc@docsrva: r7557 - in trunk: . refman-5.0 refman-5.1 refman-5.2 | paul | 27 Aug |
© 1995-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
Page generated in 0.452 sec. using MySQL 5.1.14-beta-log