Author: paul
Date: 2007-11-05 21:46:58 +0100 (Mon, 05 Nov 2007)
New Revision: 8542
Log:
r32366@polar: paul | 2007-11-05 14:46:22 -0600
Minor wording revisions.
Modified:
trunk/refman-4.1/data-types.xml
trunk/refman-5.0/data-types.xml
trunk/refman-5.1/data-types.xml
trunk/refman-6.0/data-types.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:32363
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:26562
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:21581
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:32366
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:26562
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:21581
Modified: trunk/refman-4.1/data-types.xml
===================================================================
--- trunk/refman-4.1/data-types.xml 2007-11-05 20:18:53 UTC (rev 8541)
+++ trunk/refman-4.1/data-types.xml 2007-11-05 20:46:58 UTC (rev 8542)
Changed blocks: 6, Lines Added: 13, Lines Deleted: 16; 2877 bytes
@@ -47,7 +47,7 @@
</indexterm>
<para>
- Several of the data type descriptions use these conventions:
+ Data type descriptions use these conventions:
</para>
<itemizedlist>
@@ -4306,8 +4306,7 @@
<para>
The <literal>CHAR</literal> and <literal>VARCHAR</literal> types
are similar, but differ in the way they are stored and
- retrieved. No lettercase conversion takes place during storage
- or retrieval.
+ retrieved.
</para>
<para>
@@ -4376,7 +4375,8 @@
<literal>CHAR</literal> and <literal>VARCHAR</literal> by
showing the result of storing various string values into
<literal>CHAR(4)</literal> and <literal>VARCHAR(4)</literal>
- columns:
+ columns (assuming that the column uses a single-byte character
+ set such as <literal>latin1</literal>):
</para>
<informaltable>
@@ -4446,11 +4446,10 @@
</para>
<para>
- Note that all MySQL collations are of type
- <literal>PADSPACE</literal>. This means that all
- <literal>CHAR</literal> and <literal>VARCHAR</literal> values in
- MySQL are compared without regard to any trailing spaces. For
- example:
+ All MySQL collations are of type <literal>PADSPACE</literal>.
+ This means that all <literal>CHAR</literal> and
+ <literal>VARCHAR</literal> values in MySQL are compared without
+ regard to any trailing spaces. For example:
</para>
<remark role="note">
@@ -4474,10 +4473,10 @@
</programlisting>
<para>
- Note that this is true for all MySQL versions, and it is not
- affected by the trimming of trailing spaces from
- <literal>VARCHAR</literal> values before storing them. Nor does
- the server SQL mode make any difference in this regard.
+ This is true for all MySQL versions, and it is not affected by
+ the trimming of trailing spaces from <literal>VARCHAR</literal>
+ values before storing them. Nor does the server SQL mode make
+ any difference in this regard.
</para>
<para>
@@ -4682,9 +4681,7 @@
<literal>MEDIUMTEXT</literal>, and <literal>LONGTEXT</literal>.
These correspond to the four <literal>BLOB</literal> types and
have the same maximum lengths and storage requirements. See
- <xref linkend="storage-requirements"/>. No lettercase conversion
- for <literal>TEXT</literal> or <literal>BLOB</literal> columns
- takes place during storage or retrieval.
+ <xref linkend="storage-requirements"/>.
</para>
<remark role="help-description-end"/>
Modified: trunk/refman-5.0/data-types.xml
===================================================================
--- trunk/refman-5.0/data-types.xml 2007-11-05 20:18:53 UTC (rev 8541)
+++ trunk/refman-5.0/data-types.xml 2007-11-05 20:46:58 UTC (rev 8542)
Changed blocks: 6, Lines Added: 14, Lines Deleted: 17; 3110 bytes
@@ -47,7 +47,7 @@
</indexterm>
<para>
- Several of the data type descriptions use these conventions:
+ Data type descriptions use these conventions:
</para>
<itemizedlist>
@@ -4109,7 +4109,8 @@
<literal>CHAR</literal> and <literal>VARCHAR</literal> by
showing the result of storing various string values into
<literal>CHAR(4)</literal> and <literal>VARCHAR(4)</literal>
- columns:
+ columns (assuming that the column uses a single-byte character
+ set such as <literal>latin1</literal>):
</para>
<remark role="note">
@@ -4165,11 +4166,10 @@
</informaltable>
<para>
- Note that the values shown as stored in the last row of the
- table apply <emphasis>only when not using strict
- mode</emphasis>; if MySQL is running in strict mode, values that
- exceed the column length are <emphasis>not stored</emphasis>,
- and an error results.
+ The values shown as stored in the last row of the table apply
+ <emphasis>only when not using strict mode</emphasis>; if MySQL
+ is running in strict mode, values that exceed the column length
+ are <emphasis>not stored</emphasis>, and an error results.
</para>
<para>
@@ -4207,11 +4207,10 @@
</para>
<para>
- Note that all MySQL collations are of type
- <literal>PADSPACE</literal>. This means that all
- <literal>CHAR</literal> and <literal>VARCHAR</literal> values in
- MySQL are compared without regard to any trailing spaces. For
- example:
+ All MySQL collations are of type <literal>PADSPACE</literal>.
+ This means that all <literal>CHAR</literal> and
+ <literal>VARCHAR</literal> values in MySQL are compared without
+ regard to any trailing spaces. For example:
</para>
<remark role="note">
@@ -4235,8 +4234,8 @@
</programlisting>
<para>
- Note that this is true for all MySQL versions, and it makes no
- difference whether your version trims trailing spaces from
+ This is true for all MySQL versions, and it makes no difference
+ whether your version trims trailing spaces from
<literal>VARCHAR</literal> values before storing them. Nor does
the server SQL mode make any difference in this regard.
</para>
@@ -4490,9 +4489,7 @@
<literal>MEDIUMTEXT</literal>, and <literal>LONGTEXT</literal>.
These correspond to the four <literal>BLOB</literal> types and
have the same maximum lengths and storage requirements. See
- <xref linkend="storage-requirements"/>. No lettercase conversion
- for <literal>TEXT</literal> or <literal>BLOB</literal> columns
- takes place during storage or retrieval.
+ <xref linkend="storage-requirements"/>.
</para>
<remark role="help-description-end"/>
Modified: trunk/refman-5.1/data-types.xml
===================================================================
--- trunk/refman-5.1/data-types.xml 2007-11-05 20:18:53 UTC (rev 8541)
+++ trunk/refman-5.1/data-types.xml 2007-11-05 20:46:58 UTC (rev 8542)
Changed blocks: 7, Lines Added: 15, Lines Deleted: 19; 3346 bytes
@@ -47,7 +47,7 @@
</indexterm>
<para>
- Several of the data type descriptions use these conventions:
+ Data type descriptions use these conventions:
</para>
<itemizedlist>
@@ -3863,8 +3863,7 @@
The <literal>CHAR</literal> and <literal>VARCHAR</literal> types
are similar, but differ in the way they are stored and
retrieved. They also differ in maximum length and in whether
- trailing spaces are retained. No lettercase conversion takes
- place during storage or retrieval.
+ trailing spaces are retained.
</para>
<para>
@@ -3922,7 +3921,8 @@
<literal>CHAR</literal> and <literal>VARCHAR</literal> by
showing the result of storing various string values into
<literal>CHAR(4)</literal> and <literal>VARCHAR(4)</literal>
- columns:
+ columns (assuming that the column uses a single-byte character
+ set such as <literal>latin1</literal>):
</para>
<remark role="note">
@@ -3978,11 +3978,10 @@
</informaltable>
<para>
- Note that the values shown as stored in the last row of the
- table apply <emphasis>only when not using strict
- mode</emphasis>; if MySQL is running in strict mode, values that
- exceed the column length are <emphasis>not stored</emphasis>,
- and an error results.
+ The values shown as stored in the last row of the table apply
+ <emphasis>only when not using strict mode</emphasis>; if MySQL
+ is running in strict mode, values that exceed the column length
+ are <emphasis>not stored</emphasis>, and an error results.
</para>
<para>
@@ -4020,11 +4019,10 @@
</para>
<para>
- Note that all MySQL collations are of type
- <literal>PADSPACE</literal>. This means that all
- <literal>CHAR</literal> and <literal>VARCHAR</literal> values in
- MySQL are compared without regard to any trailing spaces. For
- example:
+ All MySQL collations are of type <literal>PADSPACE</literal>.
+ This means that all <literal>CHAR</literal> and
+ <literal>VARCHAR</literal> values in MySQL are compared without
+ regard to any trailing spaces. For example:
</para>
<remark role="note">
@@ -4048,8 +4046,8 @@
</programlisting>
<para>
- Note that this is true for all MySQL versions, and that it is
- not affected by the server SQL mode.
+ This is true for all MySQL versions, and that it is not affected
+ by the server SQL mode.
</para>
<para>
@@ -4255,9 +4253,7 @@
<literal>MEDIUMTEXT</literal>, and <literal>LONGTEXT</literal>.
These correspond to the four <literal>BLOB</literal> types and
have the same maximum lengths and storage requirements. See
- <xref linkend="storage-requirements"/>. No lettercase conversion
- for <literal>TEXT</literal> or <literal>BLOB</literal> columns
- takes place during storage or retrieval.
+ <xref linkend="storage-requirements"/>.
</para>
<remark role="help-description-end"/>
Modified: trunk/refman-6.0/data-types.xml
===================================================================
--- trunk/refman-6.0/data-types.xml 2007-11-05 20:18:53 UTC (rev 8541)
+++ trunk/refman-6.0/data-types.xml 2007-11-05 20:46:58 UTC (rev 8542)
Changed blocks: 7, Lines Added: 15, Lines Deleted: 19; 3336 bytes
@@ -47,7 +47,7 @@
</indexterm>
<para>
- Several of the data type descriptions use these conventions:
+ Data type descriptions use these conventions:
</para>
<itemizedlist>
@@ -3860,8 +3860,7 @@
The <literal>CHAR</literal> and <literal>VARCHAR</literal> types
are similar, but differ in the way they are stored and
retrieved. They also differ in maximum length and in whether
- trailing spaces are retained. No lettercase conversion takes
- place during storage or retrieval.
+ trailing spaces are retained.
</para>
<para>
@@ -3919,7 +3918,8 @@
<literal>CHAR</literal> and <literal>VARCHAR</literal> by
showing the result of storing various string values into
<literal>CHAR(4)</literal> and <literal>VARCHAR(4)</literal>
- columns:
+ columns (assuming that the column uses a single-byte character
+ set such as <literal>latin1</literal>):
</para>
<remark role="note">
@@ -3975,11 +3975,10 @@
</informaltable>
<para>
- Note that the values shown as stored in the last row of the
- table apply <emphasis>only when not using strict
- mode</emphasis>; if MySQL is running in strict mode, values that
- exceed the column length are <emphasis>not stored</emphasis>,
- and an error results.
+ The values shown as stored in the last row of the table apply
+ <emphasis>only when not using strict mode</emphasis>; if MySQL
+ is running in strict mode, values that exceed the column length
+ are <emphasis>not stored</emphasis>, and an error results.
</para>
<para>
@@ -4017,11 +4016,10 @@
</para>
<para>
- Note that all MySQL collations are of type
- <literal>PADSPACE</literal>. This means that all
- <literal>CHAR</literal> and <literal>VARCHAR</literal> values in
- MySQL are compared without regard to any trailing spaces. For
- example:
+ All MySQL collations are of type <literal>PADSPACE</literal>.
+ This means that all <literal>CHAR</literal> and
+ <literal>VARCHAR</literal> values in MySQL are compared without
+ regard to any trailing spaces. For example:
</para>
<programlisting>
@@ -4041,8 +4039,8 @@
</programlisting>
<para>
- Note that this is true for all MySQL versions, and that it is
- not affected by the server SQL mode.
+ This is true for all MySQL versions, and that it is not affected
+ by the server SQL mode.
</para>
<para>
@@ -4248,9 +4246,7 @@
<literal>MEDIUMTEXT</literal>, and <literal>LONGTEXT</literal>.
These correspond to the four <literal>BLOB</literal> types and
have the same maximum lengths and storage requirements. See
- <xref linkend="storage-requirements"/>. No lettercase conversion
- for <literal>TEXT</literal> or <literal>BLOB</literal> columns
- takes place during storage or retrieval.
+ <xref linkend="storage-requirements"/>.
</para>
<remark role="help-description-end"/>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r8542 - in trunk: . refman-4.1 refman-5.0 refman-5.1 refman-6.0 | paul | 5 Nov |
