Author: paul
Date: 2007-07-24 20:15:36 +0200 (Tue, 24 Jul 2007)
New Revision: 7194
Log:
r27871@polar: paul | 2007-07-24 13:12:00 -0500
Harmonize some slightly variant wordings.
Modified:
trunk/refman-4.1/data-types.xml
trunk/refman-5.0/data-types.xml
trunk/refman-5.1/data-types.xml
trunk/refman-5.2/data-types.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:27867
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:22908
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:18941
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:27871
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:22908
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:18941
Modified: trunk/refman-4.1/data-types.xml
===================================================================
--- trunk/refman-4.1/data-types.xml 2007-07-24 17:39:09 UTC (rev 7193)
+++ trunk/refman-4.1/data-types.xml 2007-07-24 18:15:36 UTC (rev 7194)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 3; 708 bytes
@@ -4695,9 +4695,8 @@
<para>
If you assign a value to a <literal>BLOB</literal> or
<literal>TEXT</literal> column that exceeds the data type's
- maximum length, the value is truncated to fit. If the truncated
- characters are not spaces, a warning is generated. See
- <xref linkend="server-sql-mode"/>.
+ maximum length, the value is truncated to fit and a warning is
+ generated.
</para>
<para>
Modified: trunk/refman-5.0/data-types.xml
===================================================================
--- trunk/refman-5.0/data-types.xml 2007-07-24 17:39:09 UTC (rev 7193)
+++ trunk/refman-5.0/data-types.xml 2007-07-24 18:15:36 UTC (rev 7194)
Changed blocks: 2, Lines Added: 13, Lines Deleted: 14; 2261 bytes
@@ -4067,14 +4067,13 @@
</para>
<para>
- If you assign a value to a <literal>CHAR</literal> or
- <literal>VARCHAR</literal> column that exceeds the column's
- maximum length, the value is truncated to fit. If the truncated
- characters are not spaces, a warning is generated. For
- truncation of non-space characters, you can cause an error to
- occur (rather than a warning) and suppress insertion of the
- value by using strict SQL mode. See
- <xref linkend="server-sql-mode"/>.
+ If strict SQL mode is not enabled and you assign a value to a
+ <literal>CHAR</literal> or <literal>VARCHAR</literal> column
+ that exceeds the column's maximum length, the value is truncated
+ to fit and a warning is generated. For truncation of non-space
+ characters, you can cause an error to occur (rather than a
+ warning) and suppress insertion of the value by using strict SQL
+ mode. See <xref linkend="server-sql-mode"/>.
</para>
<para>
@@ -4495,13 +4494,13 @@
</para>
<para>
- When not running in strict mode, if you assign a value to a
+ If strict SQL mode is not enabled and you assign a value to a
<literal>BLOB</literal> or <literal>TEXT</literal> column that
- exceeds the data type's maximum length, the value is truncated
- to fit. If the truncated characters are not spaces, a warning is
- generated. You can cause an error to occur and the value to be
- rejected rather than to be truncated with a warning by using
- strict SQL mode. See <xref linkend="server-sql-mode"/>.
+ exceeds the column's maximum length, the value is truncated to
+ fit and a warning is generated. For truncation of non-space
+ characters, you can cause an error to occur (rather than a
+ warning) and suppress insertion of the value by using strict SQL
+ mode. See <xref linkend="server-sql-mode"/>.
</para>
<para>
Modified: trunk/refman-5.1/data-types.xml
===================================================================
--- trunk/refman-5.1/data-types.xml 2007-07-24 17:39:09 UTC (rev 7193)
+++ trunk/refman-5.1/data-types.xml 2007-07-24 18:15:36 UTC (rev 7194)
Changed blocks: 2, Lines Added: 13, Lines Deleted: 14; 2261 bytes
@@ -3891,14 +3891,13 @@
</para>
<para>
- If you assign a value to a <literal>CHAR</literal> or
- <literal>VARCHAR</literal> column that exceeds the column's
- maximum length, the value is truncated to fit. If the truncated
- characters are not spaces, a warning is generated. For
- truncation of non-space characters, you can cause an error to
- occur (rather than a warning) and suppress insertion of the
- value by using strict SQL mode. See
- <xref linkend="server-sql-mode"/>.
+ If strict SQL mode is not enabled and you assign a value to a
+ <literal>CHAR</literal> or <literal>VARCHAR</literal> column
+ that exceeds the column's maximum length, the value is truncated
+ to fit and a warning is generated. For truncation of non-space
+ characters, you can cause an error to occur (rather than a
+ warning) and suppress insertion of the value by using strict SQL
+ mode. See <xref linkend="server-sql-mode"/>.
</para>
<para>
@@ -4259,13 +4258,13 @@
</para>
<para>
- When not running in strict mode, if you assign a value to a
+ If strict SQL mode is not enabled and you assign a value to a
<literal>BLOB</literal> or <literal>TEXT</literal> column that
- exceeds the data type's maximum length, the value is truncated
- to fit. If the truncated characters are not spaces, a warning is
- generated. You can cause an error to occur and the value to be
- rejected rather than to be truncated with a warning by using
- strict SQL mode. See <xref linkend="server-sql-mode"/>.
+ exceeds the column's maximum length, the value is truncated to
+ fit and a warning is generated. For truncation of non-space
+ characters, you can cause an error to occur (rather than a
+ warning) and suppress insertion of the value by using strict SQL
+ mode. See <xref linkend="server-sql-mode"/>.
</para>
<para>
Modified: trunk/refman-5.2/data-types.xml
===================================================================
--- trunk/refman-5.2/data-types.xml 2007-07-24 17:39:09 UTC (rev 7193)
+++ trunk/refman-5.2/data-types.xml 2007-07-24 18:15:36 UTC (rev 7194)
Changed blocks: 2, Lines Added: 13, Lines Deleted: 14; 2261 bytes
@@ -3888,14 +3888,13 @@
</para>
<para>
- If you assign a value to a <literal>CHAR</literal> or
- <literal>VARCHAR</literal> column that exceeds the column's
- maximum length, the value is truncated to fit. If the truncated
- characters are not spaces, a warning is generated. For
- truncation of non-space characters, you can cause an error to
- occur (rather than a warning) and suppress insertion of the
- value by using strict SQL mode. See
- <xref linkend="server-sql-mode"/>.
+ If strict SQL mode is not enabled and you assign a value to a
+ <literal>CHAR</literal> or <literal>VARCHAR</literal> column
+ that exceeds the column's maximum length, the value is truncated
+ to fit and a warning is generated. For truncation of non-space
+ characters, you can cause an error to occur (rather than a
+ warning) and suppress insertion of the value by using strict SQL
+ mode. See <xref linkend="server-sql-mode"/>.
</para>
<para>
@@ -4256,13 +4255,13 @@
</para>
<para>
- When not running in strict mode, if you assign a value to a
+ If strict SQL mode is not enabled and you assign a value to a
<literal>BLOB</literal> or <literal>TEXT</literal> column that
- exceeds the data type's maximum length, the value is truncated
- to fit. If the truncated characters are not spaces, a warning is
- generated. You can cause an error to occur and the value to be
- rejected rather than to be truncated with a warning by using
- strict SQL mode. See <xref linkend="server-sql-mode"/>.
+ exceeds the column's maximum length, the value is truncated to
+ fit and a warning is generated. For truncation of non-space
+ characters, you can cause an error to occur (rather than a
+ warning) and suppress insertion of the value by using strict SQL
+ mode. See <xref linkend="server-sql-mode"/>.
</para>
<para>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r7194 - in trunk: . refman-4.1 refman-5.0 refman-5.1 refman-5.2 | paul | 24 Jul |
